Skip to contentSkip to conversation

owner-socketlookup update for 2.6.10

PATCH Applied Jonas Berlin 4 participants 6 messages Feb 15, 2005 – Nov 7, 2005 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 owner-socketlookup update for 2.6.10

Attached updated owner-socketlookup patch that merges cleanly against 2.6.10.

Signature · 1 line
- xkr47
include/net/tcp.h +1 -0
diff -ur --exclude-from=/tmp/srcdiff.excludes.PySd63 --new-file orig-linux-2.6.10/include/net/tcp.h linux-2.6.10/include/net/tcp.h
@@ -159,6 +159,7 @@
 extern void tcp_bucket_destroy(struct tcp_bind_bucket *tb);
 extern void tcp_bucket_unlock(struct sock *sk);
 extern int tcp_port_rover;
+extern struct sock *tcp_v4_lookup(u32 saddr, u16 sport, u32 daddr, u16 hnum, int dif);
 
 /* These are AF independent. */
 static __inline__ int tcp_bhashfn(__u16 lport)
include/net/udp.h +2 -0
diff -ur --exclude-from=/tmp/srcdiff.excludes.PySd63 --new-file orig-linux-2.6.10/include/net/udp.h linux-2.6.10/include/net/udp.h
@@ -74,6 +74,8 @@
 extern unsigned int udp_poll(struct file *file, struct socket *sock,
 			     poll_table *wait);
 
+extern struct sock *udp_v4_lookup(u32 saddr, u16 sport, u32 daddr, u16 dport, int dif);
+
 DECLARE_SNMP_STAT(struct udp_mib, udp_statistics);
 #define UDP_INC_STATS(field)		SNMP_INC_STATS(udp_statistics, field)
 #define UDP_INC_STATS_BH(field)		SNMP_INC_STATS_BH(udp_statistics, field)
net/ipv4/netfilter/ipt_owner.c +69 -24

171 lines not on this page · raw message

net/ipv4/udp.c +1 -0
diff -ur --exclude-from=/tmp/srcdiff.excludes.PySd63 --new-file orig-linux-2.6.10/net/ipv4/udp.c linux-2.6.10/net/ipv4/udp.c
@@ -1564,6 +1564,7 @@
 EXPORT_SYMBOL(udp_prot);
 EXPORT_SYMBOL(udp_sendmsg);
 EXPORT_SYMBOL(udp_poll);
+EXPORT_SYMBOL(udp_v4_lookup);
 
 #ifdef CONFIG_PROC_FS
 EXPORT_SYMBOL(udp_proc_register);
#1 lore raw
Quoted 1 line · Jonas Berlin

Attached updated owner-socketlookup patch that merges cleanly against 2.6.10.

.. instructions: just place the file in the owner-socketlookup subdirectory of patch-o-matic-ng and it should be used in favor of linux-2.6.patch when applying.

Signature · 1 line
- xkr47
Applied
#2 lore raw
In reply to Jonas Berlin
Quoted 2 lines · Jonas Berlin

Attached updated owner-socketlookup patch that merges cleanly against 2.6.10.

thanks, applied

Signature · 5 lines
- Harald Welte <[email protected]>             http://www.netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160

Quoting Norman Rasmussen on 2005-10-20 17:37 UTC:

Quoted 8 lines

The owner-socketlookup patch has once more broken between 2.6.10 and 2.6.12.

It seems that udp_v4_lookup is now static, so I've changed the header in the patch and I'll see if it helps.

Otherwise, Jonas you did such a good job on the previous attempt, if I can't get it to work, do you have time to have a look and see if you can tweak the patch to make it work against 2.6.12?

If I find spare time, certainly :)

- --
- - xkr47
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDWBpdxyF48ZTvn+4RAxczAKCKeYqjvLtr9rGiLo/eCnWM5Jsa5wCfYxdR J3Xp3CAgF7bJfU1vQP1iGSQ=
=TMrr
-----END PGP SIGNATURE-----

#5 lore raw

I tried changing (in udp.h):

extern struct sock *udp_v4_lookup

to

extern static struct sock *udp_v4_lookup

but now gcc tells me:

include/net/udp.h:77: error: multiple storage classes in declaration specifiers

:-(

any tips on getting an __inline__ function to be recognised externally, or are they mutually exclusive?

Quoted 20 lines · Jonas Berlin

-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160

Quoting Norman Rasmussen on 2005-10-20 17:37 UTC:

Quoted 8 lines

The owner-socketlookup patch has once more broken between 2.6.10 and 2.6.12.

It seems that udp_v4_lookup is now static, so I've changed the header in the patch and I'll see if it helps.

Otherwise, Jonas you did such a good job on the previous attempt, if I can't get it to work, do you have time to have a look and see if you can tweak the patch to make it work against 2.6.12?

If I find spare time, certainly :)

- --
- - xkr47
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

Quoted 5 lines

iD8DBQFDWBpdxyF48ZTvn+4RAxczAKCKeYqjvLtr9rGiLo/eCnWM5Jsa5wCfYxdR J3Xp3CAgF7bJfU1vQP1iGSQ=
=TMrr
-----END PGP SIGNATURE-----

--
- Norman Rasmussen
- Email: [email protected]
- Home page: http://norman.rasmussen.co.za/

#6 lore raw
Quoted 11 lines · Norman Rasmussen

I tried changing (in udp.h):

extern struct sock *udp_v4_lookup

to

extern static struct sock *udp_v4_lookup

but now gcc tells me:

include/net/udp.h:77: error: multiple storage classes in declaration

specifiers

Quoted 5 lines

:-(

any tips on getting an __inline__ function to be recognised externally, or are they mutually exclusive?

In udp.c you should change

static __inline__ struct ...

to

extern __inline__ struct ...

And in udp.h you should have

extern struct ...

I hope it works out. Sorry for the late reply :(

- xkr47