Changeset 99ea91b2 in mainline

Timestamp:

2015-04-20T21:11:29Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

779541b

Parents:

fab2746

Message:

UDP data notification needs to be asynchronous.

Location:

uspace/srv/net/udp

Files:

• assoc.c (modified) (1 diff)
• msg.c (modified) (1 diff)
• pdu.c (modified) (1 diff)
• service.c (modified) (6 diffs)

uspace/srv/net/udp/assoc.c

@@ -365 +365 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "call assoc->cb->recv_msg");
         assoc->cb->recv_msg(assoc->cb_arg, rsp, msg);
+        udp_assoc_delref(assoc);
 }
 

uspace/srv/net/udp/msg.c

@@ -50 +50 @@
 void udp_msg_delete(udp_msg_t *msg)
 {
+        free(msg->data);
         free(msg);
 }

uspace/srv/net/udp/pdu.c

@@ -196 +196 @@
                 return ENOMEM;
 
-        nmsg->data = text;
         nmsg->data_size = length - sizeof(udp_header_t);
+        nmsg->data = malloc(nmsg->data_size);
+        if (nmsg->data == NULL)
+                return ENOMEM;
+
+        memcpy(nmsg->data, text, nmsg->data_size);
 
         *msg = nmsg;

uspace/srv/net/udp/service.c

@@ -65 +65 @@
         udp_crcv_queue_entry_t *rqe;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_cassoc_queue_msg(%p, %p, %p)",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_cassoc_queue_msg(%p, %p, %p)",
             cassoc, sp, msg);
 
@@ -86 +86 @@
 }
 
-
-static int udp_ev_data(udp_client_t *client)
+static void udp_ev_data(udp_client_t *client)
 {
         async_exch_t *exch;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_ev_data()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_ev_data()");
 
         exch = async_exchange_begin(client->sess);
-        sysarg_t rc = async_req_0_0(exch, UDP_EV_DATA);
+        aid_t req = async_send_0(exch, UDP_EV_DATA, NULL);
         async_exchange_end(exch);
 
-        return rc;
+        async_forget(req);
 }
 
@@ -174 +173 @@
         (void) inet_addr_format(&epp->remote.addr, &ra);
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_create_impl la=%s ra=%s",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_create_impl la=%s ra=%s",
             la, ra);
 
@@ -488 +487 @@
         enext = udp_rmsg_get_next(client);
         if (enext == NULL) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "usg_rmsg_discard_srv: enext==NULL");
                 async_answer_0(iid, ENOENT);
                 return;
@@ -494 +494 @@
         list_remove(&enext->link);
         udp_msg_delete(enext->msg);
+        free(enext);
         async_answer_0(iid, EOK);
 }
@@ -510 +511 @@
 
         while (true) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "udp_client_conn: wait req");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_client_conn: wait req");
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
                 sysarg_t method = IPC_GET_IMETHOD(call);
 
-                log_msg(LOG_DEFAULT, LVL_NOTE, "udp_client_conn: method=%d",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_client_conn: method=%d",
                     (int)method);
                 if (!method) {