tag 663671 patch
thanks
On Tue, Mar 13, 2012 at 10:04:59AM +0100, Moritz Muehlenhoff wrote:
> Your package fails to build from source:
[...]
> lwipv6.c:222:40: error: 'lwip_vdeif_add' undeclared here (not in a function)
> lwipv6.c:222:55: error: 'lwip_tapif_add' undeclared here (not in a function)
> lwipv6.c:222:70: error: 'lwip_tunif_add' undeclared here (not in a function)
lwipv6 1.4a+ exposes these as macros rather than function declarations.
The replacements are lwip_add_vdeif/lwip_add_tapif/lwip_add_tunif; patch
below.
Cheers,
Matej
--- umview-0.6~/um_lwip/lwipv6.c
+++ umview-0.6/um_lwip/lwipv6.c
@@ -219,7 +219,7 @@
static char *intname[]={"vd","tp","tn"};
#define INTTYPES (sizeof(intname)/sizeof(char *))
typedef struct netif *((*netifstarfun)());
-static netifstarfun
initfun[INTTYPES]={lwip_vdeif_add,lwip_tapif_add,lwip_tunif_add};
+static netifstarfun
initfun[INTTYPES]={lwip_add_vdeif,lwip_add_tapif,lwip_add_tunif};
static char intnum[INTTYPES];
struct ifname {
unsigned char type;
@@ -334,7 +334,7 @@
for (i=0;i<INTTYPES;i++)
for (j=0;j<intnum[i];j++)
if (initfun[i] != NULL) {
- initfun[i](lwipstack,ifname(ifh,i,j));
+
initfun[i](lwipstack,ifname(ifh,i,j),NETIF_STD_FLAGS);
}
iffree(ifh);
--- umview-0.6~/umnetlwipv6/umnetlwipv6.c
+++ umview-0.6/umnetlwipv6/umnetlwipv6.c
@@ -215,11 +215,11 @@
if (totint==0)
intnum[0]=1;
for (j=0;j<intnum[0];j++)
- lwip_vdeif_add(s,ifname(ifh,0,j));
+ lwip_add_vdeif(s,ifname(ifh,0,j),NETIF_STD_FLAGS);
for (j=0;j<intnum[1];j++)
- lwip_tunif_add(s,ifname(ifh,1,j));
+ lwip_add_tunif(s,ifname(ifh,1,j),NETIF_STD_FLAGS);
for (j=0;j<intnum[2];j++)
- lwip_tapif_add(s,ifname(ifh,2,j));
+ lwip_add_tapif(s,ifname(ifh,2,j),NETIF_STD_FLAGS);
iffree(ifh);
if (paramval[0] != NULL)
