Commit518c95b

and

authored

gh-127840: pass flags and address from send_fds (GH-127841)

socket: pass flags and address from send_fdsCo-authored-by: Peter Bierma <zintensitydev@gmail.com>

1 parentb1b8962 commit518c95bCopy full SHA for 518c95b

File tree

+26

-1

lines changed

+26

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ def send_fds(sock, buffers, fds, flags=0, address=None):`
`563`	`563`	`importarray`
`564`	`564`
`565`	`565`	`returnsock.sendmsg(buffers, [(_socket.SOL_SOCKET,`
`566`		`-_socket.SCM_RIGHTS,array.array("i",fds))])`
	`566`	`+_socket.SCM_RIGHTS,array.array("i",fds))],flags,address)`
`567`	`567`	`__all__.append("send_fds")`
`568`	`568`
`569`	`569`	`ifhasattr(_socket.socket,"recvmsg"):`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7366,6 +7366,30 @@ def close_fds(fds):`
`7366`	`7366`	`data=os.read(rfd,100)`
`7367`	`7367`	`self.assertEqual(data,str(index).encode())`
`7368`	`7368`
	`7369`	`+deftestSendAndRecvFdsByAddress(self):`
	`7370`	`+rfd,wfd=os.pipe()`
	`7371`	`+self.addCleanup(os.close,rfd)`
	`7372`	`+self.addCleanup(os.close,wfd)`
	`7373`	`+`
	`7374`	`+sock=socket.socket(socket.AF_UNIX,socket.SOCK_DGRAM)`
	`7375`	`+address=socket_helper.create_unix_domain_name()`
	`7376`	`+self.addCleanup(os_helper.unlink,address)`
	`7377`	`+socket_helper.bind_unix_socket(sock,address)`
	`7378`	`+`
	`7379`	`+socket.send_fds(sock, [MSG], [rfd],0,address)`
	`7380`	`+`
	`7381`	`+# request more data and file descriptors than expected`
	`7382`	`+msg, (rfd2,),flags,addr=socket.recv_fds(sock,len(MSG)*2,2)`
	`7383`	`+self.addCleanup(os.close,rfd2)`
	`7384`	`+self.assertEqual(msg,MSG)`
	`7385`	`+self.assertEqual(flags,0)`
	`7386`	`+self.assertEqual(addr,address)`
	`7387`	`+`
	`7388`	`+# test that the file descriptor is connected`
	`7389`	`+os.write(wfd,b'data')`
	`7390`	`+data=os.read(rfd2,100)`
	`7391`	`+self.assertEqual(data,b'data')`
	`7392`	`+`
`7369`	`7393`
`7370`	`7394`	`classFreeThreadingTests(unittest.TestCase):`
`7371`	`7395`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix:func:`socket.send_fds` ignoring flags and address parameters.

Comments

(0)