Changeset 637a3b4 in mainline

Timestamp:

2012-03-09T19:41:43Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ffa8912

Parents:

fa101c4

Message:

ICMP echo replying.

Location:

uspace/srv/inet

Files:

• Makefile (modified) (1 diff)
• icmp.c (added)
• icmp.h (added)
• icmp_std.h (added)
• inet.c (modified) (3 diffs)
• inet.h (modified) (1 diff)
• pdu.c (modified) (2 diffs)
• pdu.h (modified) (1 diff)

uspace/srv/inet/Makefile ¶

@@ -32 +32 @@
 SOURCES = \
         addrobj.c \
+        icmp.c \
         inet.c \
         inet_link.c \

uspace/srv/inet/inet.c ¶

@@ -48 +48 @@
 
 #include "addrobj.h"
+#include "icmp.h"
+#include "icmp_std.h"
 #include "inet.h"
 #include "inetcfg.h"
@@ -110 +112 @@
 }
 
-static int inet_route_packet(inet_dgram_t *dgram, uint8_t proto, uint8_t ttl,
+int inet_route_packet(inet_dgram_t *dgram, uint8_t proto, uint8_t ttl,
     int df)
 {
@@ -338 +340 @@
         log_msg(LVL_DEBUG, "inet_recv_dgram_local()");
 
+        /* ICMP messages are handled internally */
+        if (proto == IP_PROTO_ICMP)
+                return icmp_recv(dgram);
+
         client = inet_client_find(proto);
         if (client == NULL) {

uspace/srv/inet/inet.h ¶

@@ -117 +117 @@
 extern int inet_ev_recv(inet_client_t *, inet_dgram_t *);
 extern int inet_recv_packet(inet_packet_t *);
+extern int inet_route_packet(inet_dgram_t *, uint8_t, uint8_t, int);
 
 #endif

uspace/srv/inet/pdu.c ¶

@@ -51 +51 @@
 static uint16_t ip_ident = 0;
 
-#define INET_CHECKSUM_INIT 0xffff
-
 /** One's complement addition.
  *
@@ -65 +63 @@
 }
 
-static uint16_t inet_checksum_calc(uint16_t ivalue, void *data, size_t size)
+uint16_t inet_checksum_calc(uint16_t ivalue, void *data, size_t size)
 {
         uint16_t sum;

uspace/srv/inet/pdu.h ¶

@@ -38 +38 @@
 #define INET_PDU_H_
 
+#include <sys/types.h>
 #include "inet.h"
+
+#define INET_CHECKSUM_INIT 0xffff
+
+extern uint16_t inet_checksum_calc(uint16_t, void *, size_t);
 
 extern int inet_pdu_encode(inet_packet_t *, void **, size_t *);