in kernel 2.6 /proc/net/x25_routes moves to /proc/net/x25/route

lib/pathnames.h

@@ -49,8 +49,8 @@
 #define _PATH_PROCNET_RARP		"/proc/net/rarp"
 #define _PATH_ETHERS			"/etc/ethers"
 #define _PATH_PROCNET_ROSE_ROUTE	"/proc/net/rose_routes"
-#define _PATH_PROCNET_X25              "/proc/net/x25"
-#define _PATH_PROCNET_X25_ROUTE                "/proc/net/x25_routes"
+#define _PATH_PROCNET_X25		"/proc/net/x25"
+#define _PATH_PROCNET_X25_ROUTE		"/proc/net/x25/route"
 #define _PATH_PROCNET_DEV_MCAST		"/proc/net/dev_mcast"
 #define _PATH_PROCNET_ATALK_ROUTE	"/proc/net/atalk_route"
 #define _PATH_SYS_BLUETOOTH_L2CAP	"/sys/class/bluetooth/l2cap"

lib/x25_gr.c

@@ -37,6 +37,7 @@
 #include <string.h>
 #include "net-support.h"
 #include "pathnames.h"
+#include "proc.h"
 #define  EXTERN
 #if 0
 #include "net-locale.h"
@@ -48,9 +49,18 @@
 #define X25_ADDR_LEN 16
 #endif
 
+static FILE *proc_fopen_x25_route(void)
+{
+	FILE *ret = proc_fopen(_PATH_PROCNET_X25_ROUTE);
+	if (ret)
+		return ret;
+	/* try old linux-2.4 name */
+	return proc_fopen("/proc/net/x25_routes");
+}
+
 int X25_rprint(int options)
 {
-	FILE *f=fopen(_PATH_PROCNET_X25_ROUTE, "r");
+	FILE *f=proc_fopen_x25_route();
 	char buffer[256];
 	char *p;
 	int  digits;