Changeset 02a09ed in mainline for uspace/srv/net/slip/slip.c

Timestamp:

2013-06-28T20:20:03Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

File:

• uspace/srv/net/slip/slip.c (modified) (9 diffs)

uspace/srv/net/slip/slip.c

@@ -38 +38 @@
 #include <stdint.h>
 #include <loc.h>
+#include <net/socket_codes.h>
+#include <inet/addr.h>
 #include <inet/iplink_srv.h>
 #include <device/char_dev.h>
@@ -50 +52 @@
 #define SLIP_END        0300
 #define SLIP_ESC        0333
-#define SLIP_ESC_END    0334
+#define SLIP_ESC_END    0334
 #define SLIP_ESC_ESC    0335
 
 static int slip_open(iplink_srv_t *);
 static int slip_close(iplink_srv_t *);
-static int slip_send(iplink_srv_t *, iplink_srv_sdu_t *);
+static int slip_send(iplink_srv_t *, iplink_sdu_t *);
 static int slip_get_mtu(iplink_srv_t *, size_t *);
-static int slip_addr_add(iplink_srv_t *, uint32_t);
-static int slip_addr_remove(iplink_srv_t *, uint32_t);
+static int slip_addr_add(iplink_srv_t *, inet_addr_t *);
+static int slip_addr_remove(iplink_srv_t *, inet_addr_t *);
 
 static iplink_srv_t slip_iplink;
@@ -118 +120 @@
 }
 
-int slip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu)
+int slip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
 {
         async_sess_t *sess = (async_sess_t *) srv->arg;
@@ -137 +139 @@
                 case SLIP_END:
                         write_buffered(sess, SLIP_ESC);
-                        write_buffered(sess, SLIP_ESC_END);     
+                        write_buffered(sess, SLIP_ESC_END);
                         break;
                 case SLIP_ESC:
@@ -161 +163 @@
 }
 
-int slip_addr_add(iplink_srv_t *srv, uint32_t addr)
+int slip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_addr_add()");
@@ -167 +169 @@
 }
 
-int slip_addr_remove(iplink_srv_t *srv, uint32_t addr)
+int slip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_addr_remove()");
@@ -207 +209 @@
         async_sess_t *sess = (async_sess_t *) arg;
         static uint8_t recv_final[SLIP_MTU];
-        iplink_srv_sdu_t sdu;
+        iplink_recv_sdu_t sdu;
         uint8_t ch;
         int rc;
 
-        sdu.lsrc = 0;
-        sdu.ldest = 0;
         sdu.data = recv_final;
 
@@ -222 +222 @@
                                 if (sdu.size == 0) {
                                         /*
-                                         * Discard the empty SLIP datagram.
-                                         */
+                                         * Discard the empty SLIP datagram.
+                                         */
                                         break;
                                 }
@@ -260 +260 @@
 
 pass:
-                rc = iplink_ev_recv(&slip_iplink, &sdu);
+                rc = iplink_ev_recv(&slip_iplink, &sdu, AF_INET);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR,