UpgradeNotes: patch

lwipv6/lwip-v6/src/core/netif.c

@@ -683 +683 @@
                         else {
                                 ifr->ifr_name[0]=nip->name[0];
                                 ifr->ifr_name[1]=nip->name[1];
-                                ifr->ifr_name[2]=(nip->num%10)+'0';
-                                ifr->ifr_name[3]= 0;
-                                ifr->ifr_name[4]= 0;
+                                /* XXX: only 100 interfaces */
+                                if (nip->num < 10 ) {
+                                    ifr->ifr_name[2]=(nip->num%10)+'0';
+                                    ifr->ifr_name[3]= 0;
+                                    ifr->ifr_name[4]= 0;
+                                }
+                                else {
+                                    ifr->ifr_name[2]=(nip->num/10)+'0';
+                                    ifr->ifr_name[3]=(nip->num%10)+'0';
+                                    ifr->ifr_name[4]= 0;
+                                }
                                 ifr->ifr_name[5]= 0;
                                 retval=ERR_OK;
                         }
                 } else {
 #define ifrname ifr->ifr_name
                         ifrname[4]=ifrname[5]=0;
-                        if (ifrname[3] != 0 || (nip = netif_find(stack, ifrname)) == NULL) {
+                        if ((nip = netif_find(stack, ifrname)) == NULL) {
+                                fprintf(stderr, "EINVAL %s\n", ifrname);
                                 retval=EINVAL;
                         }
                         else {
@@ -858 +867 @@
 
 static void netif_out_link_ifname (int index,struct netif *nip,void * buf,int *offset) {
         struct rtattr x;
-        char name[4];
-        x.rta_len=sizeof(struct rtattr)+3;
+        char name[5];
+        int fill=0;
+        int nl = 0;
+
+        /* Add the extra letters are for the device name, which has more
+         * letters when we have to encode longer interfaces.
+         * XXX: only 100 interfaces allowed */
+        if (nip->num < 10) x.rta_len=sizeof(struct rtattr)+4;
+        else x.rta_len=sizeof(struct rtattr)+5;
         x.rta_type=index;
         netlink_addanswer(buf,offset,&x,sizeof (struct rtattr));
         name[0]=nip->name[0];
         name[1]=nip->name[1];
-        name[2]=(nip->num)%10+'0';
-        name[3]=0;
-        netlink_addanswer(buf,offset,name,sizeof(name));
+        if (nip->num < 10)  {
+            name[2]=(nip->num)%10+'0';
+            name[3]=0;
+            nl = 4;
+        }
+        else {
+            /* XXX: more than 100 interfaces??? --tvf */
+            name[2]=(nip->num)/10+'0';
+            name[3]=(nip->num)%10+'0';
+            name[4] = 0;
+            nl = 5;
+        }
+        netlink_addanswer(buf,offset,name,nl);
+        if (nl % RTA_ALIGNTO > 0)
+            netlink_addanswer(buf,offset,&fill,RTA_ALIGNTO - (nl%RTA_ALIGNTO));
 }
 
 static void netif_out_link_mtu (int index,struct netif *nip,void * buf,int *offset) {

xmview-os/xmview/capture_nested.c

@@ -1192 +1192 @@
         int (*fn) (void *arg);
         void *arg;
         void *parentpcb;
+        struct npcb *npcb;
 };
 
 /* create a new (reduced) pcb for a thread */
-static struct npcb *new_npcb(struct pcb *old)
+static struct npcb *new_npcb(struct pcb *old, struct npcb *npcb)
 {
+        /*
         struct npcb *npcb;
         npcb=calloc(1,sizeof(struct npcb));
+        npcb = tryit + alloced++ * sizeof(struct npcb);
+        */
         npcb->flags=PCB_ALLOCATED;
         /* inherit the treepoch path from the generating thread */
         npcb->tst=old->tst;
@@ -1227 +1231 @@
 static int clonewrap(void *carg){
         int (*fn) (void *arg) = ((struct clonearg *)(carg))->fn;
         void *arg=((struct clonearg *)(carg))->arg;
+        struct npcb *npcb = ((struct clonearg *)(carg))->npcb;  
         /* create a new pcb for the new thread, and link the pcb with this new 
          * thread */
-        set_pcb(new_npcb(((struct clonearg *)(carg))->parentpcb));      
+        set_pcb(new_npcb(((struct clonearg *)(carg))->parentpcb, npcb));        
         /* free the data structure used to keep the thread info */
         free(carg);
         /* start the real thread */
@@ -1248 +1253 @@
         carg->fn=fn;
         carg->arg=arg;
         carg->parentpcb=get_pcb();
+        /* Calloc inside the new thread after the libc__clone call dumps core */
+        carg->npcb = calloc(1, sizeof(struct npcb));
         /* start a wrapper to the real main function of the thread */
         rv= libc__clone(clonewrap,child_stack,flags,carg,arg2,arg3,arg4);
         return rv;

xmview-os/xmview/um_exec.c

@@ -180 +180 @@
 }
 */
 
+#define NOUMBINWRAP
 #define UMBINWRAP LIBEXECDIR "/umbinwrap"
 /* wrap_in: execve handling */
 int wrap_in_execve(int sc_number,struct pcb *pc,

xmview-os/umnetlwipv6/umnetlwipv6.c

@@ -154 +154 @@
         }
 }
 
+static int parseifnum(char *arg, int *iv) {
+    int i= 0; /* Scratch */
+    for (i = 0; arg[i] != '\0' && arg[i] != '='; i++) 
+        ;
+    *iv = atoi(arg);
+    return i;
+}
+
+
 static void myputenv(struct ifname **head, int *intnum, char *paramval[], char *arg)
 {
         int i;
         for (i=0;i<INTTYPES;i++) {
                 if (strncmp(arg,intname[i],2)==0 && arg[2] >= '0' && arg[2] <= '9') {
-                        if (arg[3] == '=') {
-                                ifaddname(head, i,arg[2]-'0',arg+4);
-                                if (arg[2]-'0'+1 > intnum[i]) intnum[i]=arg[2]-'0'+1;
+                        int inum = 0;
+                        int off = parseifnum(arg+2, &inum);
+
+                        if (arg[off+2] == '=') {
+                                ifaddname(head, i,inum,arg+off+3);
+                                if (inum+1> intnum[i]) intnum[i]=inum+1;
                         }
-                        else if (arg[3] == 0) {
-                                if (arg[2]-'0' > intnum[i]) intnum[i]=arg[2]-'0';
+                        else if (arg[off+2] == 0) {
+                                if (inum +1> intnum[i]) intnum[i]=inum+1;
                         }
                         break;
                 }
@@ -244 +256 @@
 
 int umnetlwipv6_init (char *source, char *mountpoint, unsigned long flags, char *args, struct umnet *nethandle) {
         struct stack *s=lwip_stack_new();
+        lwip_stack_flags_set(s,
+                lwip_stack_flags_get(s) | LWIP_STACK_FLAG_FORWARDING);
         if (s) {
                 lwipargtoenv(s,args);
                 umnet_setprivatedata(nethandle,s);