Fixed bug #31170: lwip_setsockopt() does not set socket number

diff --git a/CHANGELOG b/CHANGELOG
index 5d4e4f2b700383c6bc4480945c6a02aeb931afe6..9e8564c2316f75a8ab9681bc2e4f2b4d1b265e09 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -229,6 +229,9 @@ HISTORY
 
   ++ Bugfixes:
 
+  2010-11-20: Simon Goldschmidt
+  * sockets.c: Fixed bug #31170: lwip_setsockopt() does not set socket number
+
   2010-11-20: Simon Goldschmidt
   * sockets.h: Fixed bug #31304: Changed SHUT_RD, SHUT_WR and SHUT_RDWR to
     resemble other stacks.

diff --git a/src/api/sockets.c b/src/api/sockets.c
index 6d1cc8007f9a2db5f133b8afffff1b7001eb495f..8cecb21ecc750159a43d63e47c5cbfc62fc8e04b 100644 (file)
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -105,8 +105,10 @@ struct lwip_select_cb {
 struct lwip_setgetsockopt_data {
   /** socket struct for which to change options */
   struct lwip_sock *sock;
+#ifdef LWIP_DEBUG
   /** socket index for which to change options */
   int s;
+#endif /* LWIP_DEBUG */
   /** level of the option to process */
   int level;
   /** name of the option to process */
@@ -1615,6 +1617,9 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen)
 
   /* Now do the actual option processing */
   data.sock = sock;
+#ifdef LWIP_DEBUG
+  data.s = s;
+#endif /* LWIP_DEBUG */
   data.level = level;
   data.optname = optname;
   data.optval = optval;
@@ -2022,6 +2027,9 @@ lwip_setsockopt(int s, int level, int optname, const void *optval, socklen_t opt
 
   /* Now do the actual option processing */
   data.sock = sock;
+#ifdef LWIP_DEBUG
+  data.s = s;
+#endif /* LWIP_DEBUG */
   data.level = level;
   data.optname = optname;
   data.optval = (void*)optval;