Attachment 158995 Details for Bug 247868 – Patch for oidentd under kernel 2.6.21 and up

[patch] Patch for oidentd under kernel 2.6.21 and up

oidentd_linux_2.6.21.patch (text/plain), 1.33 KB, created by Vilius Šumskas on 2007-07-11 19:50:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vilius Šumskas

Created: 2007-07-11 19:50:31 UTC

Size: 1.33 KB

patch

obsolete

>diff -ur oidentd.orig/src/kernel/linux.c oidentd-2.0.8/src/kernel/linux.c
>--- oidentd.orig/src/kernel/linux.c	2006-05-22 06:58:53.000000000 +0300
>+++ oidentd-2.0.8/src/kernel/linux.c	2007-07-11 21:28:56.000000000 +0300
>@@ -48,6 +48,7 @@
> #define CFILE6		"/proc/net/tcp6"
> #define MASQFILE	"/proc/net/ip_masquerade"
> #define CONNTRACK	"/proc/net/ip_conntrack"
>+#define NFCONNTRACK	"/proc/net/nf_conntrack"
> 
> static int netlink_sock;
> extern struct sockaddr_storage proxy;
>@@ -82,7 +83,15 @@
> 				debug("fopen: %s: %s", CONNTRACK, strerror(errno));
> 				return false;
> 			}
>-			masq_fp = fopen("/dev/null", "r");
>+
>+			masq_fp = fopen(NFCONNTRACK, "r");
>+			if (masq_fp == NULL) {
>+				if (errno != ENOENT) {
>+					debug("fopen: %s: %s", NFCONNTRACK, strerror(errno));
>+					return false;
>+				}
>+				masq_fp = fopen("/dev/null", "r");
>+			}
> 		}
> 
> 		netfilter = true;
>@@ -367,6 +376,15 @@
> 				&nport_temp, &mport_temp);
> 			}
> 
>+			if (ret != 21) {
>+				ret = sscanf(buf,
>+					"%*15s %*d %15s %*d %*d ESTABLISHED src=%d.%d.%d.%d dst=%d.%d.%d.%d sport=%d dport=%d packets=%*d bytes=%*d src=%d.%d.%d.%d dst=%d.%d.%d.%d sport=%d dport=%d",
>+				proto, &l1, &l2, &l3, &l4, &r1, &r2, &r3, &r4,
>+				&masq_lport_temp, &masq_fport_temp,
>+				&nl1, &nl2, &nl3, &nl4, &nr1, &nr2, &nr3, &nr4,
>+				&nport_temp, &mport_temp);
>+			}
>+
> 			if (ret != 21)
> 				continue;
>

Actions: View | Diff

Attachments on bug 247868: 158995