Changes in uspace/lib/c/generic/inet.c [d8b47eca:f9b2cb4c] in mainline

File:

• uspace/lib/c/generic/inet.c (modified) (7 diffs)

uspace/lib/c/generic/inet.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -30 +30 @@
 #include <assert.h>
 #include <errno.h>
-#include <net/socket_codes.h>
 #include <inet/inet.h>
 #include <ipc/inet.h>
 #include <ipc/services.h>
 #include <loc.h>
+#include <stdlib.h>
 
 static void inet_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -48 +48 @@
         ipc_call_t answer;
         aid_t req = async_send_0(exch, INET_CALLBACK_CREATE, &answer);
-        int rc = async_connect_to_me(exch, 0, 0, 0, inet_cb_conn, NULL);
+        
+        port_id_t port;
+        int rc = async_create_callback_port(exch, INTERFACE_INET_CB, 0, 0,
+            inet_cb_conn, NULL, &port);
+        
         async_exchange_end(exch);
         
@@ -83 +87 @@
                 return ENOENT;
         
-        inet_sess = loc_service_connect(EXCHANGE_SERIALIZE, inet_svc,
+        inet_sess = loc_service_connect(inet_svc, INTERFACE_INET,
             IPC_FLAG_BLOCKING);
         if (inet_sess == NULL)
@@ -111 +115 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, INET_SEND, dgram->tos, ttl, df,
-            &answer);
+        aid_t req = async_send_4(exch, INET_SEND, dgram->iplink, dgram->tos,
+            ttl, df, &answer);
         
         int rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
@@ -177 +181 @@
         
         dgram.tos = IPC_GET_ARG1(*icall);
+        dgram.iplink = IPC_GET_ARG2(*icall);
         
         ipc_callid_t callid;
@@ -225 +230 @@
         
         rc = inet_ev_ops->recv(&dgram);
+        free(dgram.data);
         async_answer_0(iid, rc);
 }