Attachment 56001 Details for Bug 127784

[patch] patch allowing 'flags = IPv4 IPv6'

xinetd-2.3.14-ipv6-ipv4-fallback.patch (text/plain), 1.51 KB, created by Michal Marek on 2005-10-31 12:40:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Marek

Created: 2005-10-31 12:40:16 UTC

Size: 1.51 KB

patch

obsolete

>--- xinetd/confparse.c
>+++ xinetd/confparse.c
>@@ -544,10 +544,9 @@
>    }
> 
>    if( SC_IPV4( scp ) && SC_IPV6( scp ) ) {
>-      msg( LOG_ERR, func, 
>-         "Service %s specified as both IPv4 and IPv6 - DISABLING", 
>+      msg( LOG_INFO, func,
>+         "Service %s will use IPv6 or fallback to IPv4",
> 	 SC_NAME(scp));
>-      return FAILED ;
>    }
>    
>    /*
>--- xinetd/service.c
>+++ xinetd/service.c
>@@ -322,12 +322,29 @@
>       return( OK );
>    }
> 
>-   if( SC_IPV4( scp ) ) {
>+   if( SC_IPV4( scp ) && !SC_IPV6(scp) ) {
>       SVC_FD(sp) = socket( AF_INET, 
>                            SC_SOCKET_TYPE( scp ), SC_PROTOVAL( scp ) ) ;
>    } else if( SC_IPV6( scp ) ) {
>       SVC_FD(sp) = socket( AF_INET6, 
>                            SC_SOCKET_TYPE( scp ), SC_PROTOVAL( scp ) ) ;
>+      /* service with IPv6-IPv4 fallback
>+       *  - if IPv6 succeeds, use IPv6 and clear the IPv4 flag
>+       *  - if IPv6 fails, use IPv4 socket and clear the IPv6 flag
>+       */
>+      if( SVC_FD(sp) == -1 ) {
>+         if( SC_IPV4(scp) ) {
>+            msg( LOG_INFO, func,
>+                 "IPv6 socket creation failed (%m), service = %s", SC_ID( scp ) );
>+            msg( LOG_INFO, func,
>+                 "falling back to IPv4, service = %s", SC_ID( scp ) );
>+            M_CLEAR(SC_XFLAGS(scp), SF_IPV6);
>+            SVC_FD(sp) = socket( AF_INET,
>+                                 SC_SOCKET_TYPE( scp ), SC_PROTOVAL( scp ) ) ;
>+         }
>+      } else {
>+         M_CLEAR(SC_XFLAGS(scp), SF_IPV4);
>+      }
>    }
> 
>    if ( SVC_FD(sp) == -1 )

Actions: View | Diff

Attachments on bug 127784: 56001