patch-2.3.18 linux/net/ipv4/ip_sockglue.c

• Lines: 44
• Date: Wed Sep 8 11:14:32 1999
• Orig file: v2.3.17/linux/net/ipv4/ip_sockglue.c
• Orig date: Thu Aug 26 13:05:45 1999

diff -u --recursive --new-file v2.3.17/linux/net/ipv4/ip_sockglue.c linux/net/ipv4/ip_sockglue.c
@@ -5,7 +5,7 @@
  *
  *		The IP to API glue.
  *		
- * Version:	$Id: ip_sockglue.c,v 1.44 1999/08/20 11:05:49 davem Exp $
+ * Version:	$Id: ip_sockglue.c,v 1.45 1999/09/06 04:58:03 davem Exp $
  *
  * Authors:	see ip.c
  *
@@ -598,13 +598,12 @@
  
 		default:
 #ifdef CONFIG_NETFILTER
-			release_sock(sk);
-			return nf_setsockopt(PF_INET, optname, optval, 
-					     (unsigned int)optlen);
+			err = nf_setsockopt(sk, PF_INET, optname, optval, 
+					    optlen);
 #else
 			err = -ENOPROTOOPT;
-			break;
 #endif
+			break;
 	}
 	release_sock(sk);
 	return err;
@@ -758,8 +757,17 @@
 			return put_user(len, optlen);
 		}
 		default:
+#ifdef CONFIG_NETFILTER
+			val = nf_getsockopt(sk, PF_INET, optname, optval, 
+					    &len);
+			release_sock(sk);
+			if (val >= 0)
+				val = put_user(len, optlen);
+			return val;
+#else
 			release_sock(sk);
 			return -ENOPROTOOPT;
+#endif
 	}
 	release_sock(sk);