git://git.onelab.eu
/
linux-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db507fc
)
Add changes from the Linux-2.6 tree.
author
Daniel Hokka Zakrisson
<dhokka@cs.princeton.edu>
Tue, 13 Nov 2007 21:13:52 +0000
(21:13 +0000)
committer
Daniel Hokka Zakrisson
<dhokka@cs.princeton.edu>
Tue, 13 Nov 2007 21:13:52 +0000
(21:13 +0000)
configs/kread
patch
|
blob
|
history
include/linux/netfilter_ipv4/ip_conntrack.h
patch
|
blob
|
history
mm/oom_panic.c
patch
|
blob
|
history
net/ipv4/netfilter/ip_conntrack_core.c
patch
|
blob
|
history
net/netfilter/xt_MARK.c
patch
|
blob
|
history
diff --git
a/configs/kread
b/configs/kread
index
9278afe
..
9851315
100755
(executable)
--- a/
configs/kread
+++ b/
configs/kread
@@
-5,7
+5,7
@@
# Marc E. Fiuczynski <mef@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Marc E. Fiuczynski <mef@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: kread
.py,v 1.3 2006/12/01 02:43:01
mef Exp $
+# $Id: kread
,v 1.1 2006/12/01 16:21:13
mef Exp $
#
import sys, re, os, stat
#
import sys, re, os, stat
diff --git
a/include/linux/netfilter_ipv4/ip_conntrack.h
b/include/linux/netfilter_ipv4/ip_conntrack.h
index
33581c1
..
20f90bc
100644
(file)
--- a/
include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/
include/linux/netfilter_ipv4/ip_conntrack.h
@@
-104,6
+104,9
@@
struct ip_conntrack
/* Storage reserved for other modules: */
union ip_conntrack_proto proto;
/* Storage reserved for other modules: */
union ip_conntrack_proto proto;
+ /* PLANETLAB. VNET-specific */
+ xid_t xid[IP_CT_DIR_MAX];
+
union ip_conntrack_help help;
#ifdef CONFIG_IP_NF_NAT_NEEDED
union ip_conntrack_help help;
#ifdef CONFIG_IP_NF_NAT_NEEDED
diff --git
a/mm/oom_panic.c
b/mm/oom_panic.c
index
b782934
..
4230ae5
100644
(file)
--- a/
mm/oom_panic.c
+++ b/
mm/oom_panic.c
@@
-9,7
+9,7
@@
*
* Mark Huang <mlhuang@cs.princeton.edu>
*
*
* Mark Huang <mlhuang@cs.princeton.edu>
*
- * $Id$
+ * $Id
: oom_panic.c,v 1.1 2004/10/01 17:54:48 mlhuang Exp
$
*/
#include <linux/mm.h>
*/
#include <linux/mm.h>
diff --git
a/net/ipv4/netfilter/ip_conntrack_core.c
b/net/ipv4/netfilter/ip_conntrack_core.c
index
f8b3009
..
2f2232e
100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_core.c
+++ b/
net/ipv4/netfilter/ip_conntrack_core.c
@@
-720,6
+720,8
@@
init_conntrack(struct ip_conntrack_tuple *tuple,
/* Overload tuple linked list to put us in unconfirmed list. */
list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed);
/* Overload tuple linked list to put us in unconfirmed list. */
list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed);
+ conntrack->xid[IP_CT_DIR_ORIGINAL] = -1;
+ conntrack->xid[IP_CT_DIR_REPLY] = -1;
write_unlock_bh(&ip_conntrack_lock);
write_unlock_bh(&ip_conntrack_lock);
diff --git
a/net/netfilter/xt_MARK.c
b/net/netfilter/xt_MARK.c
index
133eb2f
..
859b6af
100644
(file)
--- a/
net/netfilter/xt_MARK.c
+++ b/
net/netfilter/xt_MARK.c
@@
-138,13
+138,13
@@
target_v1(struct sk_buff **pskb,
}
if (connection_sk) {
}
if (connection_sk) {
- /* XXX:
+#ifdef REQUIRESFIXFROMSAPAN
connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
ct->xid[!dir]=connection_sk->sk_xid;
connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
ct->xid[!dir]=connection_sk->sk_xid;
- */
- connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = connection_sk->sk_xid;
+ /*connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = connection_sk->sk_xid;*/
if (connection_sk->sk_xid != 0)
mark = connection_sk->sk_xid;
if (connection_sk->sk_xid != 0)
mark = connection_sk->sk_xid;
+#endif
if (connection_sk != (*pskb)->sk)
sock_put(connection_sk);
}
if (connection_sk != (*pskb)->sk)
sock_put(connection_sk);
}