Added implementation for getsockname + unit tests

python · tiran · Aug 28, 2017 · Jul 26, 2017 · Jul 31, 2017 · Jul 31, 2017
commit 17c58d70c307ce8383a821cd6c954d5b561d49b0
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
@@ -1724,6 +1724,10 @@ def testBCM(self):
 @unittest.skipUnless(HAVE_SOCKET_CAN_ISOTP, 'CAN ISOTP required for this test.')
 class ISOTPTest(unittest.TestCase):
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.interface = "vcan0"
+
     def testCrucialConstants(self):
         socket.AF_CAN
         socket.PF_CAN
@@ -1749,14 +1753,17 @@ def testTooLongInterfaceName(self):
     def testBind(self):
         try:
             with socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP) as s:
-                s.bind(("vcan0",1,2))
-
+                addr = (self.interface,0x123,0x456)
+                s.bind(addr)
+                self.assertEqual(s.getsockname(), addr)
         except OSError as e:
-            if e.errno not in [errno.ENODEV, errno.EPROTONOSUPPORT]:
+            if e.errno == errno.ENODEV:
+                self.skipTest('network interface `%s` does not exist' %
+                           self.interface)
+            else:
                 raise
 
 
-
 @unittest.skipUnless(HAVE_SOCKET_RDS, 'RDS sockets required for this test.')
 class BasicRDSTest(unittest.TestCase):
 

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -1373,9 +1373,22 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
                 ifname = ifr.ifr_name;
         }
 
-        return Py_BuildValue("O&h", PyUnicode_DecodeFSDefault,
-                                    ifname,
-                                    a->can_family);
+        switch (proto) {
+#ifdef CAN_ISOTP
+          case CAN_ISOTP:
+          {
+              return Py_BuildValue("O&kk", PyUnicode_DecodeFSDefault,
+                                          ifname,
+                                          a->can_addr.tp.rx_id,
+                                          a->can_addr.tp.tx_id);
+          }
+#endif
+          default:
+          {
+              return Py_BuildValue("O&", PyUnicode_DecodeFSDefault,
+                                        ifname);
+          }
+        }
     }
 #endif