Re: [OOPS] patches for rh72 & dynamic WCCP for oops experimental

[Vladimir Ivaschenko]

As usual, I forgot to actually attach the patches...

Vladimir Ivaschenko wrote about "[OOPS] patches for rh72 & dynamic WCCP for oops 
experimental":

> Hi All,
> 
> Please find attached three patches to the OOPS experimental 
> release (1.5.21):
> 
> 1) environment-rh72.patch & gnu_regex.c.diff - for compilation 
> under RedHat Linux 7.2.
> 2) wccp2-dynamic-svc.patch - to make dynamic WCCPv2 work.  
> Protocol field was not set to TCP and service-group ID was
> translated to network byte order, which is not needed.
> 
> -- 
> Best Regards
> Vladimir Ivaschenko
> Certified Linux Engineer (RHCE)
> =====================================================================
> If you would like to unsubscribe from this list send message to
> [EMAIL PROTECTED] with "unsubscribe oops" in message body.
> Archive is accessible on http://lists.paco.net/oops-rus/

-- 
Best Regards
Vladimir Ivaschenko
Certified Linux Engineer (RHCE)

--- environment.h.orig  Wed Oct 31 18:32:56 2001
+++ environment.h       Tue Dec 11 17:28:08 2001
@@ -123,7 +123,7 @@
 #include    <inttypes.h>
 #endif
 
-#if !defined(HAVE_SYS_INTTYPES_H)
+#if !defined(HAVE_SYS_INTTYPES_H) && !defined(_STDINT_H)
 typedef unsigned int    uintptr_t;
 #endif
 

--- gnu_regex.c.orig    Wed Dec 12 14:40:54 2001
+++ gnu_regex.c Wed Dec 12 14:40:58 2001
@@ -76,7 +76,7 @@
 #include <strings.h>
 #endif
 
-#if defined(HAVE_STDLIB_H)
+#if defined(STDC_HEADERS) || defined(_AIX) || defined(LINUX)
 #include <stdlib.h>
 #else
 char *free ();

--- wccp2-orig.c        Mon Nov  5 18:06:51 2001
+++ wccp2.c     Wed Dec 12 14:30:34 2001
@@ -557,6 +557,7 @@
         fprintf(stderr, "Can't create wccp socket: %s\n", strerror(errno));
         return(MOD_CODE_ERR);
     }
+
     fcntl(wccp2_socket, F_SETFL, fcntl(wccp2_socket, F_GETFL, 0)|O_NONBLOCK);
     /* bind to port */
     bzero(&wccp2_bind_sa, sizeof(wccp2_bind_sa));
@@ -918,9 +919,11 @@
         HIA[2].iov_len = sizeof(send_service_info_component);
         send_message_header.Length += HIA[2].iov_len;
     } else {
+        my_xlog(OOPS_LOG_DBG, "wccp2.c:send_Here_I_Am(): group_id: %u\n", 
+g->group_id);
         send_service_info_component.Service_Type = WCCP2_SERVICE_DYNAMIC;
-        send_service_info_component.Service_ID = htons(g->group_id);
+        send_service_info_component.Service_ID = g->group_id;
         send_service_info_component.Service_Flags |=  htons(PortsDefined);
+       send_service_info_component.Protocol = 6; /* TCP */
         send_service_info_component.Port[0] = htons(g->port[0]);
         send_service_info_component.Port[1] = htons(g->port[1]);
         send_service_info_component.Port[2] = htons(g->port[2]);
@@ -1074,6 +1077,7 @@
         send_service_info_component.Service_Type = WCCP2_SERVICE_DYNAMIC;
         send_service_info_component.Service_ID = g->group_id;
         send_service_info_component.Service_Flags |=  htons(PortsDefined);
+       send_service_info_component.Protocol = 6; /* TCP */
         send_service_info_component.Port[0] = htons(g->port[0]);
         send_service_info_component.Port[1] = htons(g->port[1]);
         send_service_info_component.Port[2] = htons(g->port[2]);