r13504: add back in a comment noting fred as the contributor of the address

[bbaumbach/samba-autobuild/.git] / source4 / lib / netif / interface.c

diff --git a/source4/lib/netif/interface.c b/source4/lib/netif/interface.c
index efb7ecce3332fb2d57fe66b70bc5d0101158e1ca..2a0e3642fee40ce0c790affdc65105dfbf64b352 100644 (file)
--- a/source4/lib/netif/interface.c
+++ b/source4/lib/netif/interface.c
@@ -31,11 +31,17 @@ struct interface {
        struct ipv4_addr ip;
        struct ipv4_addr bcast;
        struct ipv4_addr nmask;
+       const char *ip_s;
+       const char *bcast_s;
+       const char *nmask_s;
 };
 
 static struct interface *local_interfaces;
 
 #define ALLONES  ((uint32_t)0xFFFFFFFF)
+/*
+  address construction based on a patch from fred@datalync.com
+*/
 #define MKBCADDR(_IP, _NM) ((_IP & _NM) | (_NM ^ ALLONES))
 #define MKNETADDR(_IP, _NM) (_IP & _NM)
 
@@ -88,11 +94,16 @@ static void add_interface(struct in_addr ip, struct in_addr nmask)
        iface->nmask = tov4(nmask);
        iface->bcast.addr = MKBCADDR(iface->ip.addr, iface->nmask.addr);
 
+       /* keep string versions too, to avoid people tripping over the implied
+          static in sys_inet_ntoa() */
+       iface->ip_s = talloc_strdup(iface, sys_inet_ntoa(iface->ip));
+       iface->bcast_s = talloc_strdup(iface, sys_inet_ntoa(iface->bcast));
+       iface->nmask_s = talloc_strdup(iface, sys_inet_ntoa(iface->nmask));
+
        DLIST_ADD_END(local_interfaces, iface, struct interface *);
 
-       DEBUG(2,("added interface ip=%s ",sys_inet_ntoa(iface->ip)));
-       DEBUG(2,("bcast=%s ",sys_inet_ntoa(iface->bcast)));
-       DEBUG(2,("nmask=%s\n",sys_inet_ntoa(iface->nmask)));         
+       DEBUG(2,("added interface ip=%s bcast=%s nmask=%s\n", 
+                iface->ip_s, iface->bcast_s, iface->nmask_s));
 }
 
 
@@ -261,7 +272,7 @@ const char *iface_n_ip(int n)
                n--;
 
        if (i) {
-               return sys_inet_ntoa(i->ip);
+               return i->ip_s;
        }
        return NULL;
 }
@@ -279,7 +290,7 @@ const char *iface_n_bcast(int n)
                n--;
 
        if (i) {
-               return sys_inet_ntoa(i->bcast);
+               return i->bcast_s;
        }
        return NULL;
 }
@@ -297,7 +308,7 @@ const char *iface_n_netmask(int n)
                n--;
 
        if (i) {
-               return sys_inet_ntoa(i->nmask);
+               return i->nmask_s;
        }
        return NULL;
 }
@@ -316,7 +327,7 @@ const char *iface_best_ip(const char *dest)
        ip.s_addr = interpret_addr(dest);
        iface = iface_find(ip, True);
        if (iface) {
-               return sys_inet_ntoa(iface->ip);
+               return iface->ip_s;
        }
        return iface_n_ip(0);
 }