From 9ec1dbd5a74134ad48eda455ddcbbe1022fdd746 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Fri, 4 Mar 2005 13:54:51 +0000 Subject: [PATCH] - merge revision 1.16 date: 2005/02/01 03:10:21; author: mlhuang; state: Exp; lines: +4 -4 - bound vnet mods by #ifdef - bound runtime vnet code by if (vnet_active) --- include/net/sock.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index a487663e0..829c1bfad 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1072,24 +1072,24 @@ extern void sk_reset_timer(struct sock *sk, struct timer_list* timer, extern void sk_stop_timer(struct sock *sk, struct timer_list* timer); -extern struct proto_ops inet_stream_ops; - -extern int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len); +extern int vnet_active; static inline int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) { int err = 0; int skb_len; +#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE) /* Silently drop if VNET is active (if INET bind() has been * overridden) and the context is not entitled to read the * packet. */ - if (inet_stream_ops.bind != inet_bind && + if (vnet_active && (int) sk->sk_xid > 0 && sk->sk_xid != skb->xid) { err = -EPERM; goto out; } +#endif /* Cast skb->rcvbuf to unsigned... It's pointless, but reduces number of warnings when compiling with -W --ANK -- 2.47.0