From: Guido van Rossum <guido@python.org>
Date: Wed, 7 May 1997 17:41:48 +0000 (+0000)
Subject: In makesockaddr(), if we don't know the address family, don't raise an
X-Git-Tag: v1.5a1~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa948df877db10abbb252232b22ba26a1ad5534d;p=python

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 7b73b632e1..bcc3fb24ae 100644
--- 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));
 
 	}
 }