SOURCES: ipxripd-kernel26.patch - real patch (Warning: builded not...

[pascalek]

Author: pascalek                     Date: Thu Jul  7 14:41:11 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- real patch (Warning: builded not tested!)

---- Files affected:
SOURCES:
   ipxripd-kernel26.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/ipxripd-kernel26.patch
diff -u SOURCES/ipxripd-kernel26.patch:1.1 SOURCES/ipxripd-kernel26.patch:1.2
--- SOURCES/ipxripd-kernel26.patch:1.1	Wed Jul  6 23:56:05 2005
+++ SOURCES/ipxripd-kernel26.patch	Thu Jul  7 16:41:06 2005
@@ -1,54 +1,35 @@
-diff -Nur ipxripd.orig/ipxd.8 ipxripd.chng/ipxd.8
---- ipxripd.orig/ipxd.8	1996-02-09 10:56:34.000000000 +0100
-+++ ipxripd.chng/ipxd.8	2005-07-06 23:44:46.000000000 +0200
-@@ -20,7 +20,7 @@
- .B ipxd
- is invoked at boot time to manage the kernel IPX routing tables.
- 
--When ipxd is started, it scans the file /proc/net/ipx_interfaces to
-+When ipxd is started, it scans the file /proc/net/ipx/interfaces to
- find the ipx networks the computer is directly connected to. It sends
- the RIP and SAP response and request packets required by the IPX
- router specification v1.20 to the interfaces it found, so that an
-@@ -33,7 +33,7 @@
- v1.20 is hopefully implemented.
- 
- Every 30 seconds, as well as on request by a HUP signal, the file
--/proc/net/ipx_interfaces is re-scanned. Changes in the network
-+/proc/net/ipx/interfaces is re-scanned. Changes in the network
- topology are detected this way and broadcasted appropriately. This
- could eventually make Linux a quite flexible IPX router.
- 
 diff -Nur ipxripd.orig/ipxkern.c ipxripd.chng/ipxkern.c
 --- ipxripd.orig/ipxkern.c	1996-02-01 17:56:07.000000000 +0100
-+++ ipxripd.chng/ipxkern.c	2005-07-06 23:44:20.000000000 +0200
-@@ -51,7 +51,7 @@
++++ ipxripd.chng/ipxkern.c	2005-07-07 16:37:01.000000000 +0200
+@@ -51,7 +51,14 @@
  	FILE *ipx_route;
  	char buf[512];
  
 -	ipx_route = fopen("/proc/net/ipx_route", "r");
-+	ipx_route = fopen("/proc/net/ipx/route", "r");
++	if (access("/proc/net/ipx/route", R_OK) == 0)
++		ipx_route = fopen("/proc/net/ipx/route", "r");
++	else if (access("/proc/net/ipx_route", R_OK) == 0)
++		ipx_route = fopen("/proc/net/ipx_route", "r");
++	else {
++		sprintf(ipx_err_string, "Can't access /proc/net/ipx_route");
++		return -1;
++	}
  
  	if (ipx_route == NULL)
  	{
-@@ -109,7 +109,7 @@
+@@ -109,7 +116,14 @@
  	FILE *ipx_ifc;
  	char buf[512];
  
 -	ipx_ifc = fopen("/proc/net/ipx_interface", "r");
-+	ipx_ifc = fopen("/proc/net/ipx/interface", "r");
++	if (access("/proc/net/ipx/interface", R_OK) == 0)
++		ipx_ifc = fopen("/proc/net/ipx/interface", "r");
++	else if (access("/proc/net/ipx_interface", R_OK) == 0)
++		ipx_ifc = fopen("/proc/net/ipx_interface", "r");
++	else {
++		sprintf(ipx_err_string, "Can't access /proc/net/ipx_interface");
++		return -1;
++	}
  
  	if (ipx_ifc == NULL)
  	{
-diff -Nur ipxripd.orig/ipx_ticks.5 ipxripd.chng/ipx_ticks.5
---- ipxripd.orig/ipx_ticks.5	1996-02-04 13:15:31.000000000 +0100
-+++ ipxripd.chng/ipx_ticks.5	2005-07-06 23:44:53.000000000 +0200
-@@ -11,7 +11,7 @@
- RIP/SAP daemon.
- 
- The RIP/SAP daemon can find out nearly all information it needs to run
--properly by scanning the file /proc/net/ipx_interfaces, and by asking
-+properly by scanning the file /proc/net/ipx/interfaces, and by asking
- other routers and servers on the net. The only information it can not
- get this way is the time it takes to send a packet over the different
- interfaces. This information is required by the IPX RIP protocol. It
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ipxripd-kernel26.patch?r1=1.1&r2=1.2&f=u