Changeset 2f19103 in mainline for uspace/srv/net/udp/service.c
- Timestamp:
- 2015-05-22T07:21:37Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 58e9dec
- Parents:
- bf7587b0
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/udp/service.c
rbf7587b0 r2f19103 54 54 #define MAX_MSG_SIZE DATA_XFER_LIMIT 55 55 56 static void udp_cassoc_recv_msg(void *, udp_sockpair_t *, udp_msg_t *);56 static void udp_cassoc_recv_msg(void *, inet_ep2_t *, udp_msg_t *); 57 57 58 58 static udp_assoc_cb_t udp_cassoc_cb = { … … 60 60 }; 61 61 62 static int udp_cassoc_queue_msg(udp_cassoc_t *cassoc, udp_sockpair_t *sp,62 static int udp_cassoc_queue_msg(udp_cassoc_t *cassoc, inet_ep2_t *epp, 63 63 udp_msg_t *msg) 64 64 { … … 66 66 67 67 log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_cassoc_queue_msg(%p, %p, %p)", 68 cassoc, sp, msg);68 cassoc, epp, msg); 69 69 70 70 rqe = calloc(1, sizeof(udp_crcv_queue_entry_t)); … … 73 73 74 74 link_initialize(&rqe->link); 75 rqe-> sp = *sp;75 rqe->epp = *epp; 76 76 rqe->msg = msg; 77 77 rqe->cassoc = cassoc; … … 144 144 } 145 145 146 static void udp_cassoc_recv_msg(void *arg, udp_sockpair_t *sp, udp_msg_t *msg)146 static void udp_cassoc_recv_msg(void *arg, inet_ep2_t *epp, udp_msg_t *msg) 147 147 { 148 148 udp_cassoc_t *cassoc = (udp_cassoc_t *) arg; 149 149 150 udp_cassoc_queue_msg(cassoc, sp, msg);150 udp_cassoc_queue_msg(cassoc, epp, msg); 151 151 udp_ev_data(cassoc->client); 152 152 } … … 157 157 udp_assoc_t *assoc; 158 158 udp_cassoc_t *cassoc; 159 udp_sock_t local;160 udp_sock_t remote;161 159 int rc; 162 160 163 161 log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_create_impl"); 164 162 165 local.addr = epp->local.addr; 166 local.port = epp->local.port; 167 remote.addr = epp->remote.addr; 168 remote.port = epp->remote.port; 169 170 assoc = udp_assoc_new(&local, &remote, NULL, NULL); 163 assoc = udp_assoc_new(epp, NULL, NULL); 171 164 if (assoc == NULL) 172 165 return EIO; … … 213 206 { 214 207 udp_msg_t msg; 215 udp_sock_t remote;216 208 udp_cassoc_t *cassoc; 217 209 int rc; … … 221 213 return rc; 222 214 223 remote.addr = dest->addr;224 remote.port = dest->port;225 226 215 msg.data = data; 227 216 msg.data_size = size; 228 rc = udp_assoc_send(cassoc->assoc, &remote, &msg);217 rc = udp_assoc_send(cassoc->assoc, dest, &msg); 229 218 if (rc != EOK) 230 219 return rc; … … 390 379 ipc_callid_t callid; 391 380 size_t size; 392 inet_ep_t ep;393 381 udp_crcv_queue_entry_t *enext; 394 382 sysarg_t assoc_id; … … 410 398 } 411 399 412 inet_ep_init(&ep); 413 ep.addr = enext->sp.foreign.addr; 414 ep.port = enext->sp.foreign.port; 415 416 rc = async_data_read_finalize(callid, &ep, max(size, (ssize_t)sizeof(ep))); 400 rc = async_data_read_finalize(callid, &enext->epp.remote, 401 max(size, (ssize_t)sizeof(inet_ep_t))); 417 402 if (rc != EOK) { 418 403 async_answer_0(iid, rc);
Note:
See TracChangeset
for help on using the changeset viewer.