Setting tag util-vserver-pl-0.4-29

[util-vserver-pl.git] / python / vserverimpl.c

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 4c6bb42..8c2818c 100644 (file)
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -49,7 +49,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "config.h"
 #include "vserver.h"
-#include "planetlab.h"
 
 static inline PyObject *inc_and_ret_none(void)
 {
@@ -390,7 +389,7 @@ get_mask(struct vc_net_addr *addr)
     offset = offsetof(struct sockaddr_in6, sin6_addr.s6_addr);
     ip = addr->vna_v6_ip.s6_addr;
     len = 16;
-    addr->vna_v6_mask.s6_addr32[9] = addr->vna_v6_mask.s6_addr32[1] = 0xffffffff;
+    addr->vna_v6_mask.s6_addr32[0] = addr->vna_v6_mask.s6_addr32[1] = 0xffffffff;
     addr->vna_v6_mask.s6_addr32[2] = addr->vna_v6_mask.s6_addr32[3] = 0x00000000;
     addr->vna_prefix = 64;
     break;
@@ -402,7 +401,7 @@ get_mask(struct vc_net_addr *addr)
   if (getifaddrs(&head) == -1)
     return -1;
   for (ifa = head; ifa; ifa = ifa->ifa_next) {
-    if (ifa->ifa_addr->sa_family == family &&
+    if (ifa->ifa_addr && ifa->ifa_addr->sa_family == family &&
         memcmp((char *) ifa->ifa_addr + offset, ip, len) == 0) {
       switch (addr->vna_type) {
       case VC_NXA_TYPE_IPV4: