Changeset b86a32e in mainline for uspace/srv/net/slip/slip.c

Timestamp:

2013-07-15T12:14:55Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

c84146d3

Parents:

87159eb8 (diff), 956d4281 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline changes.

File:

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

uspace/srv/net/slip/slip.c

@@ -58 +58 @@
 static int slip_close(iplink_srv_t *);
 static int slip_send(iplink_srv_t *, iplink_sdu_t *);
+static int slip_send6(iplink_srv_t *, iplink_sdu6_t *);
 static int slip_get_mtu(iplink_srv_t *, size_t *);
+static int slip_get_mac48(iplink_srv_t *, addr48_t *);
 static int slip_addr_add(iplink_srv_t *, inet_addr_t *);
 static int slip_addr_remove(iplink_srv_t *, inet_addr_t *);
@@ -68 +70 @@
         .close = slip_close,
         .send = slip_send,
+        .send6 = slip_send6,
         .get_mtu = slip_get_mtu,
+        .get_mac48 = slip_get_mac48,
         .addr_add = slip_addr_add,
         .addr_remove = slip_addr_remove
@@ -122 +126 @@
 int slip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
 {
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send()");
+        
         async_sess_t *sess = (async_sess_t *) srv->arg;
         uint8_t *data = sdu->data;
-        unsigned i;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send()");
-
+        
         /*
-         * Strictly speaking, this is not prescribed by the RFC, but the RFC
-         * suggests to start with sending a SLIP_END byte as a synchronization
-         * measure for dealing with previous possible noise on the line.
-         */
+         * Strictly speaking, this is not prescribed by the RFC, but the RFC
+         * suggests to start with sending a SLIP_END byte as a synchronization
+         * measure for dealing with previous possible noise on the line.
+         */
         write_buffered(sess, SLIP_END);
-
-        for (i = 0; i < sdu->size; i++) {
+        
+        for (size_t i = 0; i < sdu->size; i++) {
                 switch (data[i]) {
                 case SLIP_END:
@@ -150 +153 @@
                 }
         }
+        
         write_buffered(sess, SLIP_END);
         write_flush(sess);
-
-        return EOK;
+        
+        return EOK;
+}
+
+int slip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send6()");
+        
+        return ENOTSUP;
 }
 
@@ -161 +172 @@
         *mtu = SLIP_MTU;
         return EOK;
+}
+
+int slip_get_mac48(iplink_srv_t *src, addr48_t *mac)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_get_mac48()");
+        return ENOTSUP;
 }