innfeed, bindaddress, force-ipv4, ipv6

Julien ÉLIE julien at trigofacile.com
Thu Apr 17 20:03:57 UTC 2008


Hi Miquel,

Thanks a lot for your patch.

> --- ../orig/inn-STABLE-20080414/innfeed/connection.c 2008-04-14 11:08:15.000000000 +0200
> +++ inn-STABLE-20080414/innfeed/connection.c 2008-04-15 13:15:38.000000000 +0200

I added:

@@ -328,7 +324,6 @@
 int cxnConfigLoadCbk (void *data UNUSED)
 {
   long iv ;
-  char *sv ;
   int rval = 1 ;
   FILE *fp = (FILE *) data ;



@@ -553,7 +517,7 @@
       return false ;
     }

-  memcpy( &cxnAddr, retAddr, SA_LEN(retAddr) );
+  memcpy( (struct sockaddr_storage *)&cxnAddr, retAddr, SA_LEN(retAddr) );

 #ifdef HAVE_INET6
   if( cxnAddr.ss_family == AF_INET6 )
@@ -581,7 +545,7 @@
   /* bind to a specified IPv6 address */
   if( (cxnAddr.ss_family == AF_INET6) && bind_addr6 )
     {
-      memcpy( &cxnSelf, bind_addr6, sizeof(struct sockaddr_in6) );
+      memcpy( (struct sockaddr_storage *)&cxnSelf, bind_addr6, sizeof(struct sockaddr_in6) );
       if (bind (fd, (struct sockaddr *) &cxnSelf,
                  sizeof(struct sockaddr_in6)) < 0)
        {
@@ -605,7 +569,7 @@
   if (bind_addr)
 #endif
     {
-      memcpy( &cxnSelf, bind_addr, sizeof(struct sockaddr_in) );
+      memcpy( (struct sockaddr_storage *)&cxnSelf, bind_addr, sizeof(struct sockaddr_in) );
       if (bind (fd, (struct sockaddr *) &cxnSelf,
                  sizeof(struct sockaddr_in) ) < 0)
        {


Is it a cast to (struct sockaddr_storage *) and not (struct sockaddr_in/in6 *) or
(struct sockaddr *) which should be done?
--> const struct sockaddr_storage cxnAddr, cxnSelf ;



> --- ../orig/inn-STABLE-20080414/innfeed/host.c 2008-04-14 11:08:15.000000000 +0200
> +++ inn-STABLE-20080414/innfeed/host.c 2008-04-17 18:57:48.000000000 +0200
> +      if ( strcmp(q, "any") != 0 && strcmp(q, "all") != 0 != 0 &&
> +    strcmp(q, "none") != 0)

Only one "!= 0" here.


> +#ifdef HAVE_INET6
> +  GETBOOL(s,fp,"force-ipv4",NOTREQ,p->forceIPv4,inherit);
> +  if (p->forceIPv4)
> +    p->family = AF_INET;
> +#endif

Thanks!

-- 
Julien ÉLIE

« Ma parole... Vous êtes soûls ! Heu ! Sourds... » (Astérix) 



More information about the inn-workers mailing list