diff options
author | David Howells <dhowells@redhat.com> | 2007-04-26 18:55:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-04-26 18:55:48 -0400 |
commit | 63b6be55e8b51cb718468794d343058e96c7462c (patch) | |
tree | 83c06275ba6b7ca1ffbf8c2e52497d7bceed567c /include | |
parent | 08e0e7c82eeadec6f4871a386b86bf0f0fbcb4eb (diff) |
[AF_RXRPC]: Delete the old RxRPC code.
Delete the old RxRPC code as it's now no longer used.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/rxrpc/call.h | 212 | ||||
-rw-r--r-- | include/rxrpc/connection.h | 83 | ||||
-rw-r--r-- | include/rxrpc/krxiod.h | 27 | ||||
-rw-r--r-- | include/rxrpc/krxsecd.h | 22 | ||||
-rw-r--r-- | include/rxrpc/krxtimod.h | 45 | ||||
-rw-r--r-- | include/rxrpc/message.h | 71 | ||||
-rw-r--r-- | include/rxrpc/packet.h | 22 | ||||
-rw-r--r-- | include/rxrpc/peer.h | 82 | ||||
-rw-r--r-- | include/rxrpc/rxrpc.h | 36 | ||||
-rw-r--r-- | include/rxrpc/transport.h | 106 |
10 files changed, 8 insertions, 698 deletions
diff --git a/include/rxrpc/call.h b/include/rxrpc/call.h deleted file mode 100644 index b86f83743510..000000000000 --- a/include/rxrpc/call.h +++ /dev/null | |||
@@ -1,212 +0,0 @@ | |||
1 | /* call.h: Rx call record | ||
2 | * | ||
3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _LINUX_RXRPC_CALL_H | ||
13 | #define _LINUX_RXRPC_CALL_H | ||
14 | |||
15 | #include <rxrpc/types.h> | ||
16 | #include <rxrpc/rxrpc.h> | ||
17 | #include <rxrpc/packet.h> | ||
18 | #include <linux/timer.h> | ||
19 | |||
20 | #define RXRPC_CALL_ACK_WINDOW_SIZE 16 | ||
21 | |||
22 | extern unsigned rxrpc_call_rcv_timeout; /* receive activity timeout (secs) */ | ||
23 | |||
24 | /* application call state | ||
25 | * - only state 0 and ffff are reserved, the state is set to 1 after an opid is received | ||
26 | */ | ||
27 | enum rxrpc_app_cstate { | ||
28 | RXRPC_CSTATE_COMPLETE = 0, /* operation complete */ | ||
29 | RXRPC_CSTATE_ERROR, /* operation ICMP error or aborted */ | ||
30 | RXRPC_CSTATE_SRVR_RCV_OPID, /* [SERVER] receiving operation ID */ | ||
31 | RXRPC_CSTATE_SRVR_RCV_ARGS, /* [SERVER] receiving operation data */ | ||
32 | RXRPC_CSTATE_SRVR_GOT_ARGS, /* [SERVER] completely received operation data */ | ||
33 | RXRPC_CSTATE_SRVR_SND_REPLY, /* [SERVER] sending operation reply */ | ||
34 | RXRPC_CSTATE_SRVR_RCV_FINAL_ACK, /* [SERVER] receiving final ACK */ | ||
35 | RXRPC_CSTATE_CLNT_SND_ARGS, /* [CLIENT] sending operation args */ | ||
36 | RXRPC_CSTATE_CLNT_RCV_REPLY, /* [CLIENT] receiving operation reply */ | ||
37 | RXRPC_CSTATE_CLNT_GOT_REPLY, /* [CLIENT] completely received operation reply */ | ||
38 | } __attribute__((packed)); | ||
39 | |||
40 | extern const char *rxrpc_call_states[]; | ||
41 | |||
42 | enum rxrpc_app_estate { | ||
43 | RXRPC_ESTATE_NO_ERROR = 0, /* no error */ | ||
44 | RXRPC_ESTATE_LOCAL_ABORT, /* aborted locally by application layer */ | ||
45 | RXRPC_ESTATE_PEER_ABORT, /* aborted remotely by peer */ | ||
46 | RXRPC_ESTATE_LOCAL_ERROR, /* local ICMP network error */ | ||
47 | RXRPC_ESTATE_REMOTE_ERROR, /* remote ICMP network error */ | ||
48 | } __attribute__((packed)); | ||
49 | |||
50 | extern const char *rxrpc_call_error_states[]; | ||
51 | |||
52 | /*****************************************************************************/ | ||
53 | /* | ||
54 | * Rx call record and application scratch buffer | ||
55 | * - the call record occupies the bottom of a complete page | ||
56 | * - the application scratch buffer occupies the rest | ||
57 | */ | ||
58 | struct rxrpc_call | ||
59 | { | ||
60 | atomic_t usage; | ||
61 | struct rxrpc_connection *conn; /* connection upon which active */ | ||
62 | spinlock_t lock; /* access lock */ | ||
63 | struct module *owner; /* owner module */ | ||
64 | wait_queue_head_t waitq; /* wait queue for events to happen */ | ||
65 | struct list_head link; /* general internal list link */ | ||
66 | struct list_head call_link; /* master call list link */ | ||
67 | __be32 chan_ix; /* connection channel index */ | ||
68 | __be32 call_id; /* call ID on connection */ | ||
69 | unsigned long cjif; /* jiffies at call creation */ | ||
70 | unsigned long flags; /* control flags */ | ||
71 | #define RXRPC_CALL_ACKS_TIMO 0x00000001 /* ACKS timeout reached */ | ||
72 | #define RXRPC_CALL_ACKR_TIMO 0x00000002 /* ACKR timeout reached */ | ||
73 | #define RXRPC_CALL_RCV_TIMO 0x00000004 /* RCV timeout reached */ | ||
74 | #define RXRPC_CALL_RCV_PKT 0x00000008 /* received packet */ | ||
75 | |||
76 | /* transmission */ | ||
77 | rxrpc_seq_t snd_seq_count; /* outgoing packet sequence number counter */ | ||
78 | struct rxrpc_message *snd_nextmsg; /* next message being constructed for sending */ | ||
79 | struct rxrpc_message *snd_ping; /* last ping message sent */ | ||
80 | unsigned short snd_resend_cnt; /* count of resends since last ACK */ | ||
81 | |||
82 | /* transmission ACK tracking */ | ||
83 | struct list_head acks_pendq; /* messages pending ACK (ordered by seq) */ | ||
84 | unsigned acks_pend_cnt; /* number of un-ACK'd packets */ | ||
85 | rxrpc_seq_t acks_dftv_seq; /* highest definitively ACK'd msg seq */ | ||
86 | struct timer_list acks_timeout; /* timeout on expected ACK */ | ||
87 | |||
88 | /* reception */ | ||
89 | struct list_head rcv_receiveq; /* messages pending reception (ordered by seq) */ | ||
90 | struct list_head rcv_krxiodq_lk; /* krxiod queue for new inbound packets */ | ||
91 | struct timer_list rcv_timeout; /* call receive activity timeout */ | ||
92 | |||
93 | /* reception ACK'ing */ | ||
94 | rxrpc_seq_t ackr_win_bot; /* bottom of ACK window */ | ||
95 | rxrpc_seq_t ackr_win_top; /* top of ACK window */ | ||
96 | rxrpc_seq_t ackr_high_seq; /* highest seqno yet received */ | ||
97 | rxrpc_seq_net_t ackr_prev_seq; /* previous seqno received */ | ||
98 | unsigned ackr_pend_cnt; /* number of pending ACKs */ | ||
99 | struct timer_list ackr_dfr_timo; /* timeout on deferred ACK */ | ||
100 | char ackr_dfr_perm; /* request for deferred ACKs permitted */ | ||
101 | rxrpc_seq_t ackr_dfr_seq; /* seqno for deferred ACK */ | ||
102 | struct rxrpc_ackpacket ackr; /* pending normal ACK packet */ | ||
103 | uint8_t ackr_array[RXRPC_CALL_ACK_WINDOW_SIZE]; /* ACK records */ | ||
104 | |||
105 | /* presentation layer */ | ||
106 | char app_last_rcv; /* T if received last packet from remote end */ | ||
107 | enum rxrpc_app_cstate app_call_state; /* call state */ | ||
108 | enum rxrpc_app_estate app_err_state; /* abort/error state */ | ||
109 | struct list_head app_readyq; /* ordered ready received packet queue */ | ||
110 | struct list_head app_unreadyq; /* ordered post-hole recv'd packet queue */ | ||
111 | rxrpc_seq_t app_ready_seq; /* last seq number dropped into readyq */ | ||
112 | size_t app_ready_qty; /* amount of data ready in readyq */ | ||
113 | unsigned app_opcode; /* operation ID */ | ||
114 | unsigned app_abort_code; /* abort code (when aborted) */ | ||
115 | int app_errno; /* error number (when ICMP error received) */ | ||
116 | |||
117 | /* statisics */ | ||
118 | unsigned pkt_rcv_count; /* count of received packets on this call */ | ||
119 | unsigned pkt_snd_count; /* count of sent packets on this call */ | ||
120 | unsigned app_read_count; /* number of reads issued */ | ||
121 | |||
122 | /* bits for the application to use */ | ||
123 | rxrpc_call_attn_func_t app_attn_func; /* callback when attention required */ | ||
124 | rxrpc_call_error_func_t app_error_func; /* callback when abort sent (cleanup and put) */ | ||
125 | rxrpc_call_aemap_func_t app_aemap_func; /* callback to map abort code to/from errno */ | ||
126 | void *app_user; /* application data */ | ||
127 | struct list_head app_link; /* application list linkage */ | ||
128 | struct list_head app_attn_link; /* application attention list linkage */ | ||
129 | size_t app_mark; /* trigger callback when app_ready_qty>=app_mark */ | ||
130 | char app_async_read; /* T if in async-read mode */ | ||
131 | uint8_t *app_read_buf; /* application async read buffer (app_mark size) */ | ||
132 | uint8_t *app_scr_alloc; /* application scratch allocation pointer */ | ||
133 | void *app_scr_ptr; /* application pointer into scratch buffer */ | ||
134 | |||
135 | #define RXRPC_APP_MARK_EOF 0xFFFFFFFFU /* mark at end of input */ | ||
136 | |||
137 | /* application scratch buffer */ | ||
138 | uint8_t app_scratch[0] __attribute__((aligned(sizeof(long)))); | ||
139 | }; | ||
140 | |||
141 | #define RXRPC_CALL_SCRATCH_SIZE (PAGE_SIZE - sizeof(struct rxrpc_call)) | ||
142 | |||
143 | #define rxrpc_call_reset_scratch(CALL) \ | ||
144 | do { (CALL)->app_scr_alloc = (CALL)->app_scratch; } while(0) | ||
145 | |||
146 | #define rxrpc_call_alloc_scratch(CALL,SIZE) \ | ||
147 | ({ \ | ||
148 | void *ptr; \ | ||
149 | ptr = (CALL)->app_scr_alloc; \ | ||
150 | (CALL)->app_scr_alloc += (SIZE); \ | ||
151 | if ((SIZE)>RXRPC_CALL_SCRATCH_SIZE || \ | ||
152 | (size_t)((CALL)->app_scr_alloc - (u8*)(CALL)) > RXRPC_CALL_SCRATCH_SIZE) { \ | ||
153 | printk("rxrpc_call_alloc_scratch(%p,%Zu)\n",(CALL),(size_t)(SIZE)); \ | ||
154 | BUG(); \ | ||
155 | } \ | ||
156 | ptr; \ | ||
157 | }) | ||
158 | |||
159 | #define rxrpc_call_alloc_scratch_s(CALL,TYPE) \ | ||
160 | ({ \ | ||
161 | size_t size = sizeof(TYPE); \ | ||
162 | TYPE *ptr; \ | ||
163 | ptr = (TYPE*)(CALL)->app_scr_alloc; \ | ||
164 | (CALL)->app_scr_alloc += size; \ | ||
165 | if (size>RXRPC_CALL_SCRATCH_SIZE || \ | ||
166 | (size_t)((CALL)->app_scr_alloc - (u8*)(CALL)) > RXRPC_CALL_SCRATCH_SIZE) { \ | ||
167 | printk("rxrpc_call_alloc_scratch(%p,%Zu)\n",(CALL),size); \ | ||
168 | BUG(); \ | ||
169 | } \ | ||
170 | ptr; \ | ||
171 | }) | ||
172 | |||
173 | #define rxrpc_call_is_ack_pending(CALL) ((CALL)->ackr.reason != 0) | ||
174 | |||
175 | extern int rxrpc_create_call(struct rxrpc_connection *conn, | ||
176 | rxrpc_call_attn_func_t attn, | ||
177 | rxrpc_call_error_func_t error, | ||
178 | rxrpc_call_aemap_func_t aemap, | ||
179 | struct rxrpc_call **_call); | ||
180 | |||
181 | extern int rxrpc_incoming_call(struct rxrpc_connection *conn, | ||
182 | struct rxrpc_message *msg, | ||
183 | struct rxrpc_call **_call); | ||
184 | |||
185 | static inline void rxrpc_get_call(struct rxrpc_call *call) | ||
186 | { | ||
187 | BUG_ON(atomic_read(&call->usage)<=0); | ||
188 | atomic_inc(&call->usage); | ||
189 | /*printk("rxrpc_get_call(%p{u=%d})\n",(C),atomic_read(&(C)->usage));*/ | ||
190 | } | ||
191 | |||
192 | extern void rxrpc_put_call(struct rxrpc_call *call); | ||
193 | |||
194 | extern void rxrpc_call_do_stuff(struct rxrpc_call *call); | ||
195 | |||
196 | extern int rxrpc_call_abort(struct rxrpc_call *call, int error); | ||
197 | |||
198 | #define RXRPC_CALL_READ_BLOCK 0x0001 /* block if not enough data and not yet EOF */ | ||
199 | #define RXRPC_CALL_READ_ALL 0x0002 /* error if insufficient data received */ | ||
200 | extern int rxrpc_call_read_data(struct rxrpc_call *call, void *buffer, size_t size, int flags); | ||
201 | |||
202 | extern int rxrpc_call_write_data(struct rxrpc_call *call, | ||
203 | size_t sioc, | ||
204 | struct kvec *siov, | ||
205 | uint8_t rxhdr_flags, | ||
206 | gfp_t alloc_flags, | ||
207 | int dup_data, | ||
208 | size_t *size_sent); | ||
209 | |||
210 | extern void rxrpc_call_handle_error(struct rxrpc_call *conn, int local, int errno); | ||
211 | |||
212 | #endif /* _LINUX_RXRPC_CALL_H */ | ||
diff --git a/include/rxrpc/connection.h b/include/rxrpc/connection.h deleted file mode 100644 index 41e6781ad067..000000000000 --- a/include/rxrpc/connection.h +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | /* connection.h: Rx connection record | ||
2 | * | ||
3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _LINUX_RXRPC_CONNECTION_H | ||
13 | #define _LINUX_RXRPC_CONNECTION_H | ||
14 | |||
15 | #include <rxrpc/types.h> | ||
16 | #include <rxrpc/krxtimod.h> | ||
17 | |||
18 | struct sk_buff; | ||
19 | |||
20 | /*****************************************************************************/ | ||
21 | /* | ||
22 | * Rx connection | ||
23 | * - connections are matched by (rmt_port,rmt_addr,service_id,conn_id,clientflag) | ||
24 | * - connections only retain a refcount on the peer when they are active | ||
25 | * - connections with refcount==0 are inactive and reside in the peer's graveyard | ||
26 | */ | ||
27 | struct rxrpc_connection | ||
28 | { | ||
29 | atomic_t usage; | ||
30 | struct rxrpc_transport *trans; /* transport endpoint */ | ||
31 | struct rxrpc_peer *peer; /* peer from/to which connected */ | ||
32 | struct rxrpc_service *service; /* responsible service (inbound conns) */ | ||
33 | struct rxrpc_timer timeout; /* decaching timer */ | ||
34 | struct list_head link; /* link in peer's list */ | ||
35 | struct list_head proc_link; /* link in proc list */ | ||
36 | struct list_head err_link; /* link in ICMP error processing list */ | ||
37 | struct list_head id_link; /* link in ID grant list */ | ||
38 | struct sockaddr_in addr; /* remote address */ | ||
39 | struct rxrpc_call *channels[4]; /* channels (active calls) */ | ||
40 | wait_queue_head_t chanwait; /* wait for channel to become available */ | ||
41 | spinlock_t lock; /* access lock */ | ||
42 | struct timeval atime; /* last access time */ | ||
43 | size_t mtu_size; /* MTU size for outbound messages */ | ||
44 | unsigned call_counter; /* call ID counter */ | ||
45 | rxrpc_serial_t serial_counter; /* packet serial number counter */ | ||
46 | |||
47 | /* the following should all be in net order */ | ||
48 | __be32 in_epoch; /* peer's epoch */ | ||
49 | __be32 out_epoch; /* my epoch */ | ||
50 | __be32 conn_id; /* connection ID, appropriately shifted */ | ||
51 | __be16 service_id; /* service ID */ | ||
52 | uint8_t security_ix; /* security ID */ | ||
53 | uint8_t in_clientflag; /* RXRPC_CLIENT_INITIATED if we are server */ | ||
54 | uint8_t out_clientflag; /* RXRPC_CLIENT_INITIATED if we are client */ | ||
55 | }; | ||
56 | |||
57 | extern int rxrpc_create_connection(struct rxrpc_transport *trans, | ||
58 | __be16 port, | ||
59 | __be32 addr, | ||
60 | uint16_t service_id, | ||
61 | void *security, | ||
62 | struct rxrpc_connection **_conn); | ||
63 | |||
64 | extern int rxrpc_connection_lookup(struct rxrpc_peer *peer, | ||
65 | struct rxrpc_message *msg, | ||
66 | struct rxrpc_connection **_conn); | ||
67 | |||
68 | static inline void rxrpc_get_connection(struct rxrpc_connection *conn) | ||
69 | { | ||
70 | BUG_ON(atomic_read(&conn->usage)<0); | ||
71 | atomic_inc(&conn->usage); | ||
72 | //printk("rxrpc_get_conn(%p{u=%d})\n",conn,atomic_read(&conn->usage)); | ||
73 | } | ||
74 | |||
75 | extern void rxrpc_put_connection(struct rxrpc_connection *conn); | ||
76 | |||
77 | extern int rxrpc_conn_receive_call_packet(struct rxrpc_connection *conn, | ||
78 | struct rxrpc_call *call, | ||
79 | struct rxrpc_message *msg); | ||
80 | |||
81 | extern void rxrpc_conn_handle_error(struct rxrpc_connection *conn, int local, int errno); | ||
82 | |||
83 | #endif /* _LINUX_RXRPC_CONNECTION_H */ | ||
diff --git a/include/rxrpc/krxiod.h b/include/rxrpc/krxiod.h deleted file mode 100644 index c0e0e82e4df2..000000000000 --- a/include/rxrpc/krxiod.h +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /* krxiod.h: Rx RPC I/O kernel thread interface | ||
2 | * | ||
3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _LINUX_RXRPC_KRXIOD_H | ||
13 | #define _LINUX_RXRPC_KRXIOD_H | ||
14 | |||
15 | #include <rxrpc/types.h> | ||
16 | |||
17 | extern int rxrpc_krxiod_init(void); | ||
18 | extern void rxrpc_krxiod_kill(void); | ||
19 | extern void rxrpc_krxiod_queue_transport(struct rxrpc_transport *trans); | ||
20 | extern void rxrpc_krxiod_dequeue_transport(struct rxrpc_transport *trans); | ||
21 | extern void rxrpc_krxiod_queue_peer(struct rxrpc_peer *peer); | ||
22 | extern void rxrpc_krxiod_dequeue_peer(struct rxrpc_peer *peer); | ||
23 | extern void rxrpc_krxiod_clear_peers(struct rxrpc_transport *trans); | ||
24 | extern void rxrpc_krxiod_queue_call(struct rxrpc_call *call); | ||
25 | extern void rxrpc_krxiod_dequeue_call(struct rxrpc_call *call); | ||
26 | |||
27 | #endif /* _LINUX_RXRPC_KRXIOD_H */ | ||
diff --git a/include/rxrpc/krxsecd.h b/include/rxrpc/krxsecd.h deleted file mode 100644 index 55ce43a25b38..000000000000 --- a/include/rxrpc/krxsecd.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | /* krxsecd.h: Rx RPC security kernel thread interface | ||
2 | * | ||
3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _LINUX_RXRPC_KRXSECD_H | ||
13 | #define _LINUX_RXRPC_KRXSECD_H | ||
14 | |||
15 | #include <rxrpc/types.h> | ||
16 | |||
17 | extern int rxrpc_krxsecd_init(void); | ||
18 | extern void rxrpc_krxsecd_kill(void); | ||
19 | extern void rxrpc_krxsecd_clear_transport(struct rxrpc_transport *trans); | ||
20 | extern void rxrpc_krxsecd_queue_incoming_call(struct rxrpc_message *msg); | ||
21 | |||
22 | #endif /* _LINUX_RXRPC_KRXSECD_H */ | ||
diff --git a/include/rxrpc/krxtimod.h b/include/rxrpc/krxtimod.h deleted file mode 100644 index b3d298b612f2..000000000000 --- a/include/rxrpc/krxtimod.h +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | /* krxtimod.h: RxRPC timeout daemon | ||
2 | * | ||
3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _LINUX_RXRPC_KRXTIMOD_H | ||
13 | #define _LINUX_RXRPC_KRXTIMOD_H | ||
14 | |||
15 | #include <rxrpc/types.h> | ||
16 | |||
17 | struct rxrpc_timer_ops { | ||
18 | /* called when the front of the timer queue has timed out */ | ||
19 | void (*timed_out)(struct rxrpc_timer *timer); | ||
20 | }; | ||
21 | |||
22 | /*****************************************************************************/ | ||
23 | /* | ||
24 | * RXRPC timer/timeout record | ||
25 | */ | ||
26 | struct rxrpc_timer | ||
27 | { | ||
28 | struct list_head link; /* link in timer queue */ | ||
29 | unsigned long timo_jif; /* timeout time */ | ||
30 | const struct rxrpc_timer_ops *ops; /* timeout expiry function */ | ||
31 | }; | ||
32 | |||
33 | static inline void rxrpc_timer_init(rxrpc_timer_t *timer, const struct rxrpc_timer_ops *ops) | ||
34 | { | ||
35 | INIT_LIST_HEAD(&timer->link); | ||
36 | timer->ops = ops; | ||
37 | } | ||
38 | |||
39 | extern int rxrpc_krxtimod_start(void); | ||
40 | extern void rxrpc_krxtimod_kill(void); | ||
41 | |||
42 | extern void rxrpc_krxtimod_add_timer(rxrpc_timer_t *timer, unsigned long timeout); | ||
43 | extern int rxrpc_krxtimod_del_timer(rxrpc_timer_t *timer); | ||
44 | |||
45 | #endif /* _LINUX_RXRPC_KRXTIMOD_H */ | ||
diff --git a/include/rxrpc/message.h b/include/rxrpc/message.h deleted file mode 100644 index b318f273d4f2..000000000000 --- a/include/rxrpc/message.h +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | /* message.h: Rx message caching | ||
2 | * | ||
3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _LINUX_RXRPC_MESSAGE_H | ||
13 | #define _LINUX_RXRPC_MESSAGE_H | ||
14 | |||
15 | #include <rxrpc/packet.h> | ||
16 | |||
17 | /*****************************************************************************/ | ||
18 | /* | ||
19 | * Rx message record | ||
20 | */ | ||
21 | struct rxrpc_message | ||
22 | { | ||
23 | atomic_t usage; | ||
24 | struct list_head link; /* list link */ | ||
25 | struct timeval stamp; /* time received or last sent */ | ||
26 | rxrpc_seq_t seq; /* message sequence number */ | ||
27 | |||
28 | int state; /* the state the message is currently in */ | ||
29 | #define RXRPC_MSG_PREPARED 0 | ||
30 | #define RXRPC_MSG_SENT 1 | ||
31 | #define RXRPC_MSG_ACKED 2 /* provisionally ACK'd */ | ||
32 | #define RXRPC_MSG_DONE 3 /* definitively ACK'd (msg->seq<ack.firstPacket) */ | ||
33 | #define RXRPC_MSG_RECEIVED 4 | ||
34 | #define RXRPC_MSG_ERROR -1 | ||
35 | char rttdone; /* used for RTT */ | ||
36 | |||
37 | struct rxrpc_transport *trans; /* transport received through */ | ||
38 | struct rxrpc_connection *conn; /* connection received over */ | ||
39 | struct sk_buff *pkt; /* received packet */ | ||
40 | off_t offset; /* offset into pkt of next byte of data */ | ||
41 | |||
42 | struct rxrpc_header hdr; /* message header */ | ||
43 | |||
44 | int dcount; /* data part count */ | ||
45 | size_t dsize; /* data size */ | ||
46 | #define RXRPC_MSG_MAX_IOCS 8 | ||
47 | struct kvec data[RXRPC_MSG_MAX_IOCS]; /* message data */ | ||
48 | unsigned long dfree; /* bit mask indicating kfree(data[x]) if T */ | ||
49 | }; | ||
50 | |||
51 | #define rxrpc_get_message(M) do { atomic_inc(&(M)->usage); } while(0) | ||
52 | |||
53 | extern void __rxrpc_put_message(struct rxrpc_message *msg); | ||
54 | static inline void rxrpc_put_message(struct rxrpc_message *msg) | ||
55 | { | ||
56 | BUG_ON(atomic_read(&msg->usage)<=0); | ||
57 | if (atomic_dec_and_test(&msg->usage)) | ||
58 | __rxrpc_put_message(msg); | ||
59 | } | ||
60 | |||
61 | extern int rxrpc_conn_newmsg(struct rxrpc_connection *conn, | ||
62 | struct rxrpc_call *call, | ||
63 | uint8_t type, | ||
64 | int count, | ||
65 | struct kvec *diov, | ||
66 | gfp_t alloc_flags, | ||
67 | struct rxrpc_message **_msg); | ||
68 | |||
69 | extern int rxrpc_conn_sendmsg(struct rxrpc_connection *conn, struct rxrpc_message *msg); | ||
70 | |||
71 | #endif /* _LINUX_RXRPC_MESSAGE_H */ | ||
diff --git a/include/rxrpc/packet.h b/include/rxrpc/packet.h index 09b11a1e8d46..b69e6e173ea1 100644 --- a/include/rxrpc/packet.h +++ b/include/rxrpc/packet.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* packet.h: Rx packet layout and definitions | 1 | /* packet.h: Rx packet layout and definitions |
2 | * | 2 | * |
3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2002, 2007 Red Hat, Inc. All Rights Reserved. |
4 | * Written by David Howells (dhowells@redhat.com) | 4 | * Written by David Howells (dhowells@redhat.com) |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
@@ -12,21 +12,17 @@ | |||
12 | #ifndef _LINUX_RXRPC_PACKET_H | 12 | #ifndef _LINUX_RXRPC_PACKET_H |
13 | #define _LINUX_RXRPC_PACKET_H | 13 | #define _LINUX_RXRPC_PACKET_H |
14 | 14 | ||
15 | #include <rxrpc/types.h> | 15 | typedef u32 rxrpc_seq_t; /* Rx message sequence number */ |
16 | 16 | typedef u32 rxrpc_serial_t; /* Rx message serial number */ | |
17 | #define RXRPC_IPUDP_SIZE 28 | 17 | typedef __be32 rxrpc_seq_net_t; /* on-the-wire Rx message sequence number */ |
18 | extern size_t RXRPC_MAX_PACKET_SIZE; | 18 | typedef __be32 rxrpc_serial_net_t; /* on-the-wire Rx message serial number */ |
19 | #define RXRPC_MAX_PACKET_DATA_SIZE (RXRPC_MAX_PACKET_SIZE - sizeof(struct rxrpc_header)) | ||
20 | #define RXRPC_LOCAL_PACKET_SIZE RXRPC_MAX_PACKET_SIZE | ||
21 | #define RXRPC_REMOTE_PACKET_SIZE (576 - RXRPC_IPUDP_SIZE) | ||
22 | 19 | ||
23 | /*****************************************************************************/ | 20 | /*****************************************************************************/ |
24 | /* | 21 | /* |
25 | * on-the-wire Rx packet header | 22 | * on-the-wire Rx packet header |
26 | * - all multibyte fields should be in network byte order | 23 | * - all multibyte fields should be in network byte order |
27 | */ | 24 | */ |
28 | struct rxrpc_header | 25 | struct rxrpc_header { |
29 | { | ||
30 | __be32 epoch; /* client boot timestamp */ | 26 | __be32 epoch; /* client boot timestamp */ |
31 | 27 | ||
32 | __be32 cid; /* connection and channel ID */ | 28 | __be32 cid; /* connection and channel ID */ |
@@ -85,8 +81,7 @@ extern const char *rxrpc_pkts[]; | |||
85 | * - new__rsvd = j__rsvd | 81 | * - new__rsvd = j__rsvd |
86 | * - duplicating all other fields | 82 | * - duplicating all other fields |
87 | */ | 83 | */ |
88 | struct rxrpc_jumbo_header | 84 | struct rxrpc_jumbo_header { |
89 | { | ||
90 | uint8_t flags; /* packet flags (as per rxrpc_header) */ | 85 | uint8_t flags; /* packet flags (as per rxrpc_header) */ |
91 | uint8_t pad; | 86 | uint8_t pad; |
92 | __be16 _rsvd; /* reserved (used by kerberos security as cksum) */ | 87 | __be16 _rsvd; /* reserved (used by kerberos security as cksum) */ |
@@ -99,8 +94,7 @@ struct rxrpc_jumbo_header | |||
99 | * on-the-wire Rx ACK packet data payload | 94 | * on-the-wire Rx ACK packet data payload |
100 | * - all multibyte fields should be in network byte order | 95 | * - all multibyte fields should be in network byte order |
101 | */ | 96 | */ |
102 | struct rxrpc_ackpacket | 97 | struct rxrpc_ackpacket { |
103 | { | ||
104 | __be16 bufferSpace; /* number of packet buffers available */ | 98 | __be16 bufferSpace; /* number of packet buffers available */ |
105 | __be16 maxSkew; /* diff between serno being ACK'd and highest serial no | 99 | __be16 maxSkew; /* diff between serno being ACK'd and highest serial no |
106 | * received */ | 100 | * received */ |
diff --git a/include/rxrpc/peer.h b/include/rxrpc/peer.h deleted file mode 100644 index 8b8fe97cbbcc..000000000000 --- a/include/rxrpc/peer.h +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | /* peer.h: Rx RPC per-transport peer record | ||
2 | * | ||
3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _LINUX_RXRPC_PEER_H | ||
13 | #define _LINUX_RXRPC_PEER_H | ||
14 | |||
15 | #include <linux/wait.h> | ||
16 | #include <rxrpc/types.h> | ||
17 | #include <rxrpc/krxtimod.h> | ||
18 | |||
19 | struct rxrpc_peer_ops | ||
20 | { | ||
21 | /* peer record being added */ | ||
22 | int (*adding)(struct rxrpc_peer *peer); | ||
23 | |||
24 | /* peer record being discarded from graveyard */ | ||
25 | void (*discarding)(struct rxrpc_peer *peer); | ||
26 | |||
27 | /* change of epoch detected on connection */ | ||
28 | void (*change_of_epoch)(struct rxrpc_connection *conn); | ||
29 | }; | ||
30 | |||
31 | /*****************************************************************************/ | ||
32 | /* | ||
33 | * Rx RPC per-transport peer record | ||
34 | * - peers only retain a refcount on the transport when they are active | ||
35 | * - peers with refcount==0 are inactive and reside in the transport's graveyard | ||
36 | */ | ||
37 | struct rxrpc_peer | ||
38 | { | ||
39 | atomic_t usage; | ||
40 | struct rxrpc_peer_ops *ops; /* operations on this peer */ | ||
41 | struct rxrpc_transport *trans; /* owner transport */ | ||
42 | struct rxrpc_timer timeout; /* timeout for grave destruction */ | ||
43 | struct list_head link; /* link in transport's peer list */ | ||
44 | struct list_head proc_link; /* link in /proc list */ | ||
45 | rwlock_t conn_idlock; /* lock for connection IDs */ | ||
46 | struct list_head conn_idlist; /* list of connections granted IDs */ | ||
47 | uint32_t conn_idcounter; /* connection ID counter */ | ||
48 | rwlock_t conn_lock; /* lock for active/dead connections */ | ||
49 | struct list_head conn_active; /* active connections to/from this peer */ | ||
50 | struct list_head conn_graveyard; /* graveyard for inactive connections */ | ||
51 | spinlock_t conn_gylock; /* lock for conn_graveyard */ | ||
52 | wait_queue_head_t conn_gy_waitq; /* wait queue hit when graveyard is empty */ | ||
53 | atomic_t conn_count; /* number of attached connections */ | ||
54 | struct in_addr addr; /* remote address */ | ||
55 | size_t if_mtu; /* interface MTU for this peer */ | ||
56 | spinlock_t lock; /* access lock */ | ||
57 | |||
58 | void *user; /* application layer data */ | ||
59 | |||
60 | /* calculated RTT cache */ | ||
61 | #define RXRPC_RTT_CACHE_SIZE 32 | ||
62 | suseconds_t rtt; /* current RTT estimate (in uS) */ | ||
63 | unsigned rtt_point; /* next entry at which to insert */ | ||
64 | unsigned rtt_usage; /* amount of cache actually used */ | ||
65 | suseconds_t rtt_cache[RXRPC_RTT_CACHE_SIZE]; /* calculated RTT cache */ | ||
66 | }; | ||
67 | |||
68 | |||
69 | extern int rxrpc_peer_lookup(struct rxrpc_transport *trans, | ||
70 | __be32 addr, | ||
71 | struct rxrpc_peer **_peer); | ||
72 | |||
73 | static inline void rxrpc_get_peer(struct rxrpc_peer *peer) | ||
74 | { | ||
75 | BUG_ON(atomic_read(&peer->usage)<0); | ||
76 | atomic_inc(&peer->usage); | ||
77 | //printk("rxrpc_get_peer(%p{u=%d})\n",peer,atomic_read(&peer->usage)); | ||
78 | } | ||
79 | |||
80 | extern void rxrpc_put_peer(struct rxrpc_peer *peer); | ||
81 | |||
82 | #endif /* _LINUX_RXRPC_PEER_H */ | ||
diff --git a/include/rxrpc/rxrpc.h b/include/rxrpc/rxrpc.h deleted file mode 100644 index 8d9874cef991..000000000000 --- a/include/rxrpc/rxrpc.h +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | /* rx.h: Rx RPC interface | ||
2 | * | ||
3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _LINUX_RXRPC_RXRPC_H | ||
13 | #define _LINUX_RXRPC_RXRPC_H | ||
14 | |||
15 | #ifdef __KERNEL__ | ||
16 | |||
17 | extern __be32 rxrpc_epoch; | ||
18 | |||
19 | #ifdef CONFIG_SYSCTL | ||
20 | extern int rxrpc_ktrace; | ||
21 | extern int rxrpc_kdebug; | ||
22 | extern int rxrpc_kproto; | ||
23 | extern int rxrpc_knet; | ||
24 | #else | ||
25 | #define rxrpc_ktrace 0 | ||
26 | #define rxrpc_kdebug 0 | ||
27 | #define rxrpc_kproto 0 | ||
28 | #define rxrpc_knet 0 | ||
29 | #endif | ||
30 | |||
31 | extern int rxrpc_sysctl_init(void); | ||
32 | extern void rxrpc_sysctl_cleanup(void); | ||
33 | |||
34 | #endif /* __KERNEL__ */ | ||
35 | |||
36 | #endif /* _LINUX_RXRPC_RXRPC_H */ | ||
diff --git a/include/rxrpc/transport.h b/include/rxrpc/transport.h deleted file mode 100644 index 7c7b9683fa39..000000000000 --- a/include/rxrpc/transport.h +++ /dev/null | |||
@@ -1,106 +0,0 @@ | |||
1 | /* transport.h: Rx transport management | ||
2 | * | ||
3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _LINUX_RXRPC_TRANSPORT_H | ||
13 | #define _LINUX_RXRPC_TRANSPORT_H | ||
14 | |||
15 | #include <rxrpc/types.h> | ||
16 | #include <rxrpc/krxiod.h> | ||
17 | #include <rxrpc/rxrpc.h> | ||
18 | #include <linux/skbuff.h> | ||
19 | #include <linux/rwsem.h> | ||
20 | |||
21 | typedef int (*rxrpc_newcall_fnx_t)(struct rxrpc_call *call); | ||
22 | |||
23 | extern wait_queue_head_t rxrpc_krxiod_wq; | ||
24 | |||
25 | /*****************************************************************************/ | ||
26 | /* | ||
27 | * Rx operation specification | ||
28 | * - tables of these must be sorted by op ID so that they can be binary-chop searched | ||
29 | */ | ||
30 | struct rxrpc_operation | ||
31 | { | ||
32 | unsigned id; /* operation ID */ | ||
33 | size_t asize; /* minimum size of argument block */ | ||
34 | const char *name; /* name of operation */ | ||
35 | void *user; /* initial user data */ | ||
36 | }; | ||
37 | |||
38 | /*****************************************************************************/ | ||
39 | /* | ||
40 | * Rx transport service record | ||
41 | */ | ||
42 | struct rxrpc_service | ||
43 | { | ||
44 | struct list_head link; /* link in services list on transport */ | ||
45 | struct module *owner; /* owner module */ | ||
46 | rxrpc_newcall_fnx_t new_call; /* new call handler function */ | ||
47 | const char *name; /* name of service */ | ||
48 | unsigned short service_id; /* Rx service ID */ | ||
49 | rxrpc_call_attn_func_t attn_func; /* call requires attention callback */ | ||
50 | rxrpc_call_error_func_t error_func; /* call error callback */ | ||
51 | rxrpc_call_aemap_func_t aemap_func; /* abort -> errno mapping callback */ | ||
52 | |||
53 | const struct rxrpc_operation *ops_begin; /* beginning of operations table */ | ||
54 | const struct rxrpc_operation *ops_end; /* end of operations table */ | ||
55 | }; | ||
56 | |||
57 | /*****************************************************************************/ | ||
58 | /* | ||
59 | * Rx transport endpoint record | ||
60 | */ | ||
61 | struct rxrpc_transport | ||
62 | { | ||
63 | atomic_t usage; | ||
64 | struct socket *socket; /* my UDP socket */ | ||
65 | struct list_head services; /* services listening on this socket */ | ||
66 | struct list_head link; /* link in transport list */ | ||
67 | struct list_head proc_link; /* link in transport proc list */ | ||
68 | struct list_head krxiodq_link; /* krxiod attention queue link */ | ||
69 | spinlock_t lock; /* access lock */ | ||
70 | struct list_head peer_active; /* active peers connected to over this socket */ | ||
71 | struct list_head peer_graveyard; /* inactive peer list */ | ||
72 | spinlock_t peer_gylock; /* peer graveyard lock */ | ||
73 | wait_queue_head_t peer_gy_waitq; /* wait queue hit when peer graveyard is empty */ | ||
74 | rwlock_t peer_lock; /* peer list access lock */ | ||
75 | atomic_t peer_count; /* number of peers */ | ||
76 | struct rxrpc_peer_ops *peer_ops; /* default peer operations */ | ||
77 | unsigned short port; /* port upon which listening */ | ||
78 | volatile char error_rcvd; /* T if received ICMP error outstanding */ | ||
79 | }; | ||
80 | |||
81 | extern int rxrpc_create_transport(unsigned short port, | ||
82 | struct rxrpc_transport **_trans); | ||
83 | |||
84 | static inline void rxrpc_get_transport(struct rxrpc_transport *trans) | ||
85 | { | ||
86 | BUG_ON(atomic_read(&trans->usage) <= 0); | ||
87 | atomic_inc(&trans->usage); | ||
88 | //printk("rxrpc_get_transport(%p{u=%d})\n", | ||
89 | // trans, atomic_read(&trans->usage)); | ||
90 | } | ||
91 | |||
92 | extern void rxrpc_put_transport(struct rxrpc_transport *trans); | ||
93 | |||
94 | extern int rxrpc_add_service(struct rxrpc_transport *trans, | ||
95 | struct rxrpc_service *srv); | ||
96 | |||
97 | extern void rxrpc_del_service(struct rxrpc_transport *trans, | ||
98 | struct rxrpc_service *srv); | ||
99 | |||
100 | extern void rxrpc_trans_receive_packet(struct rxrpc_transport *trans); | ||
101 | |||
102 | extern int rxrpc_trans_immediate_abort(struct rxrpc_transport *trans, | ||
103 | struct rxrpc_message *msg, | ||
104 | int error); | ||
105 | |||
106 | #endif /* _LINUX_RXRPC_TRANSPORT_H */ | ||