Changeset ce1836e in mainline for uspace/srv/net

Timestamp:

2012-05-15T19:51:06Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2bd578a

Parents:

6df2202 (diff), bf9e6fc (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 renaming and other improvements.

Location:

uspace/srv/net/inetsrv

Files:

• Makefile (moved) (moved from uspace/srv/net/inet/Makefile ) (1 diff)
• addrobj.c (moved) (moved from uspace/srv/net/inet/addrobj.c ) (5 diffs)
• addrobj.h (moved) (moved from uspace/srv/net/inet/addrobj.h ) (2 diffs)
• icmp.c (moved) (moved from uspace/srv/net/inet/icmp.c ) (1 diff)
• icmp.h (moved) (moved from uspace/srv/net/inet/icmp.h ) (1 diff)
• icmp_std.h (moved) (moved from uspace/srv/net/inet/icmp_std.h )
• inet_link.c (moved) (moved from uspace/srv/net/inet/inet_link.c ) (3 diffs)
• inet_link.h (moved) (moved from uspace/srv/net/inet/inet_link.h ) (1 diff)
• inet_std.h (moved) (moved from uspace/srv/net/inet/inet_std.h )
• inet_util.c (moved) (moved from uspace/srv/net/inet/inet_util.c )
• inet_util.h (moved) (moved from uspace/srv/net/inet/inet_util.h )
• inetcfg.c (moved) (moved from uspace/srv/net/inet/inetcfg.c ) (2 diffs)
• inetcfg.h (moved) (moved from uspace/srv/net/inet/inetcfg.h )
• inetping.c (moved) (moved from uspace/srv/net/inet/inetping.c ) (1 diff)
• inetping.h (moved) (moved from uspace/srv/net/inet/inetping.h )
• inetsrv.c (moved) (moved from uspace/srv/net/inet/inet.c ) (2 diffs)
• inetsrv.h (moved) (moved from uspace/srv/net/inet/inet.h ) (2 diffs)
• pdu.c (moved) (moved from uspace/srv/net/inet/pdu.c ) (1 diff)
• pdu.h (moved) (moved from uspace/srv/net/inet/pdu.h ) (1 diff)
• reass.c (moved) (moved from uspace/srv/net/inet/reass.c ) (1 diff)
• reass.h (moved) (moved from uspace/srv/net/inet/reass.h ) (1 diff)
• sroute.c (moved) (moved from uspace/srv/net/inet/sroute.c ) (1 diff)
• sroute.h (moved) (moved from uspace/srv/net/inet/sroute.h ) (1 diff)

uspace/srv/net/inetsrv/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-BINARY = inet
+BINARY = inetsrv
 
 SOURCES = \
         addrobj.c \
         icmp.c \
-        inet.c \
+        inetsrv.c \
         inet_link.c \
         inet_util.c \

uspace/srv/net/inetsrv/addrobj.c

@@ -44 +44 @@
 
 #include "addrobj.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inet_link.h"
 #include "inet_util.h"
+
+static inet_addrobj_t *inet_addrobj_find_by_name_locked(const char *, inet_link_t *);
 
 static FIBRIL_MUTEX_INITIALIZE(addr_list_lock);
@@ -77 +79 @@
 }
 
-void inet_addrobj_add(inet_addrobj_t *addr)
-{
-        fibril_mutex_lock(&addr_list_lock);
+int inet_addrobj_add(inet_addrobj_t *addr)
+{
+        inet_addrobj_t *aobj;
+
+        fibril_mutex_lock(&addr_list_lock);
+        aobj = inet_addrobj_find_by_name_locked(addr->name, addr->ilink);
+        if (aobj != NULL) {
+                /* Duplicate address name */
+                fibril_mutex_unlock(&addr_list_lock);
+                return EEXISTS;
+        }
+
         list_append(&addr->addr_list, &addr_list);
         fibril_mutex_unlock(&addr_list_lock);
+
+        return EOK;
 }
 
@@ -130 +143 @@
  * @return      Address object
  */
-inet_addrobj_t *inet_addrobj_find_by_name(const char *name, inet_link_t *ilink)
-{
-        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name('%s', '%s')",
+static inet_addrobj_t *inet_addrobj_find_by_name_locked(const char *name, inet_link_t *ilink)
+{
+        assert(fibril_mutex_is_locked(&addr_list_lock));
+
+        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked('%s', '%s')",
             name, ilink->svc_name);
 
-        fibril_mutex_lock(&addr_list_lock);
-
         list_foreach(addr_list, link) {
                 inet_addrobj_t *naddr = list_get_instance(link,
@@ -142 +155 @@
 
                 if (naddr->ilink == ilink && str_cmp(naddr->name, name) == 0) {
-                        fibril_mutex_unlock(&addr_list_lock);
-                        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name: found %p",
+                        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked: found %p",
                             naddr);
                         return naddr;
@@ -149 +161 @@
         }
 
-        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name: Not found");
-        fibril_mutex_unlock(&addr_list_lock);
+        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked: Not found");
 
         return NULL;
+}
+
+
+/** Find address object on a link, with a specific name.
+ *
+ * @param name  Address object name
+ * @param ilink Inet link
+ * @return      Address object
+ */
+inet_addrobj_t *inet_addrobj_find_by_name(const char *name, inet_link_t *ilink)
+{
+        inet_addrobj_t *aobj;
+
+        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name('%s', '%s')",
+            name, ilink->svc_name);
+
+        fibril_mutex_lock(&addr_list_lock);
+        aobj = inet_addrobj_find_by_name_locked(name, ilink);
+        fibril_mutex_unlock(&addr_list_lock);
+
+        return aobj;
 }
 

uspace/srv/net/inetsrv/addrobj.h

@@ -39 +39 @@
 
 #include <sys/types.h>
-#include "inet.h"
+#include "inetsrv.h"
 
 typedef enum {
@@ -50 +50 @@
 extern inet_addrobj_t *inet_addrobj_new(void);
 extern void inet_addrobj_delete(inet_addrobj_t *);
-extern void inet_addrobj_add(inet_addrobj_t *);
+extern int inet_addrobj_add(inet_addrobj_t *);
 extern void inet_addrobj_remove(inet_addrobj_t *);
 extern inet_addrobj_t *inet_addrobj_find(inet_addr_t *, inet_addrobj_find_t);

uspace/srv/net/inetsrv/icmp.c

@@ -43 +43 @@
 #include "icmp.h"
 #include "icmp_std.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inetping.h"
 #include "pdu.h"

uspace/srv/net/inetsrv/icmp.h

@@ -38 +38 @@
 #define ICMP_H_
 
-#include "inet.h"
+#include "inetsrv.h"
 
 extern int icmp_recv(inet_dgram_t *);

uspace/srv/net/inetsrv/inet_link.c

@@ -45 +45 @@
 
 #include "addrobj.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inet_link.h"
 #include "pdu.h"
@@ -207 +207 @@
         addr->ilink = ilink;
         addr->name = str_dup("v4a");
-        inet_addrobj_add(addr);
+        rc = inet_addrobj_add(addr);
+        if (rc != EOK) {
+                log_msg(LVL_ERROR, "Failed setting IP address on internet link.");
+                inet_addrobj_delete(addr);
+                /* XXX Roll back */
+                return rc;
+        }
 
         iaddr.ipv4 = addr->naddr.ipv4;
@@ -213 +219 @@
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed setting IP address on internet link.");
+                inet_addrobj_remove(addr);
+                inet_addrobj_delete(addr);
                 /* XXX Roll back */
                 return rc;

uspace/srv/net/inetsrv/inet_link.h

@@ -39 +39 @@
 
 #include <sys/types.h>
-#include "inet.h"
+#include "inetsrv.h"
 
 extern int inet_link_discovery_start(void);

uspace/srv/net/inetsrv/inetcfg.c

@@ -46 +46 @@
 
 #include "addrobj.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inet_link.h"
 #include "inetcfg.h"
@@ -75 +75 @@
         addr->ilink = ilink;
         addr->name = str_dup(name);
-        inet_addrobj_add(addr);
+        rc = inet_addrobj_add(addr);
+        if (rc != EOK) {
+                log_msg(LVL_DEBUG, "Duplicate address name '%s'.", addr->name);
+                inet_addrobj_delete(addr);
+                return rc;
+        }
 
         iaddr.ipv4 = addr->naddr.ipv4;

uspace/srv/net/inetsrv/inetping.c

@@ -46 +46 @@
 #include "icmp.h"
 #include "icmp_std.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inetping.h"
 

uspace/srv/net/inetsrv/inetsrv.c

@@ -50 +50 @@
 #include "icmp.h"
 #include "icmp_std.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inetcfg.h"
 #include "inetping.h"
@@ -57 +57 @@
 #include "sroute.h"
 
-#define NAME "inet"
+#define NAME "inetsrv"
 
 static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);

uspace/srv/net/inetsrv/inetsrv.h

@@ -27 +27 @@
  */
 
-/** @addtogroup inet
+/** @addtogroup inetsrv
  * @{
  */
@@ -35 +35 @@
  */
 
-#ifndef INET_H_
-#define INET_H_
+#ifndef INETSRV_H_
+#define INETSRV_H_
 
 #include <adt/list.h>

uspace/srv/net/inetsrv/pdu.c

@@ -45 +45 @@
 #include <stdlib.h>
 
-#include "inet.h"
+#include "inetsrv.h"
 #include "inet_std.h"
 #include "pdu.h"

uspace/srv/net/inetsrv/pdu.h

@@ -39 +39 @@
 
 #include <sys/types.h>
-#include "inet.h"
+#include "inetsrv.h"
 
 #define INET_CHECKSUM_INIT 0xffff

uspace/srv/net/inetsrv/reass.c

@@ -42 +42 @@
 #include <stdlib.h>
 
-#include "inet.h"
+#include "inetsrv.h"
 #include "inet_std.h"
 #include "reass.h"

uspace/srv/net/inetsrv/reass.h

@@ -39 +39 @@
 
 #include <sys/types.h>
-#include "inet.h"
+#include "inetsrv.h"
 
 extern int inet_reass_queue_packet(inet_packet_t *);

uspace/srv/net/inetsrv/sroute.c

@@ -44 +44 @@
 
 #include "sroute.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inet_link.h"
 #include "inet_util.h"

uspace/srv/net/inetsrv/sroute.h

@@ -39 +39 @@
 
 #include <sys/types.h>
-#include "inet.h"
+#include "inetsrv.h"
 
 extern inet_sroute_t *inet_sroute_new(void);