In makesockaddr(), if we don't know the address family, don't raise an

exception -- return it as a tuple.  Seems useful in promiscuous mode.

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 7b73b632e1b1630e37534f5ee4a1427bf1093d02..bcc3fb24aedf44ac137e49040dfe04cd8bdff54e 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -364,9 +364,12 @@ BUILD_FUNC_DEF_2(makesockaddr,struct sockaddr *,addr, int,addrlen)
        /* More cases here... */
 
        default:
-               PyErr_SetString(PySocket_Error,
-                               "return unknown socket address type");
-               return NULL;
+               /* If we don't know the address family, don't raise an
+                  exception -- return it as a tuple. */
+               return Py_BuildValue("is#",
+                                    addr->sa_family,
+                                    addr->sa_data,
+                                    sizeof(addr->sa_data));
 
        }
 }