NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd1b7d48

committed

Provide errno-translation wrappers around bind() and listen() on Windows.

I've seen one too many "could not bind IPv4 socket: No error" log entriesfrom the Windows buildfarm members. Per previous discussion, this islikely caused by the fact that we're doing nothing to translateWSAGetLastError() to errno. Put in a wrapper layer to do that.If this works as expected, it should get back-patched, but let's see whathappens in the buildfarm first.Discussion: <4065.1452450340@sss.pgh.pa.us>

1 parentdeb71fa commitd1b7d48Copy full SHA for d1b7d48

File tree

2 files changed

+28

-0

lines changed

src
- backend/port/win32
  - socket.c
- include/port
  - win32.h

2 files changed

+28

-0

lines changed

`‎src/backend/port/win32/socket.c`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,10 @@`
`27`	`27`	`*/`
`28`	`28`	`intpgwin32_noblock=0;`
`29`	`29`
	`30`	`+/* Undef the macros defined in win32.h, so we can access system functions */`
`30`	`31`	`#undef socket`
	`32`	`+#undef bind`
	`33`	`+#undef listen`
`31`	`34`	`#undef accept`
`32`	`35`	`#undef connect`
`33`	`36`	`#undef select`
`@@ -261,6 +264,27 @@ pgwin32_socket(int af, int type, int protocol)`
`261`	`264`	`returns;`
`262`	`265`	`}`
`263`	`266`
	`267`	`+int`
	`268`	`+pgwin32_bind(SOCKETs,structsockaddraddr,intaddrlen)`
	`269`	`+{`
	`270`	`+intres;`
	`271`	`+`
	`272`	`+res=bind(s,addr,addrlen);`
	`273`	`+if (res<0)`
	`274`	`+TranslateSocketError();`
	`275`	`+returnres;`
	`276`	`+}`
	`277`	`+`
	`278`	`+int`
	`279`	`+pgwin32_listen(SOCKETs,intbacklog)`
	`280`	`+{`
	`281`	`+intres;`
	`282`	`+`
	`283`	`+res=listen(s,backlog);`
	`284`	`+if (res<0)`
	`285`	`+TranslateSocketError();`
	`286`	`+returnres;`
	`287`	`+}`
`264`	`288`
`265`	`289`	`SOCKET`
`266`	`290`	`pgwin32_accept(SOCKETs,structsockaddraddr,intaddrlen)`

`‎src/include/port/win32.h`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -364,13 +364,17 @@ voidpg_queue_signal(int signum);`
`364`	`364`	`/* In backend/port/win32/socket.c */`
`365`	`365`	`#ifndefFRONTEND`
`366`	`366`	`#definesocket(af,type,protocol) pgwin32_socket(af, type, protocol)`
	`367`	`+#definebind(s,addr,addrlen) pgwin32_bind(s, addr, addrlen)`
	`368`	`+#definelisten(s,backlog) pgwin32_listen(s, backlog)`
`367`	`369`	`#defineaccept(s,addr,addrlen) pgwin32_accept(s, addr, addrlen)`
`368`	`370`	`#defineconnect(s,name,namelen) pgwin32_connect(s, name, namelen)`
`369`	`371`	`#defineselect(n,r,w,e,timeout) pgwin32_select(n, r, w, e, timeout)`
`370`	`372`	`#definerecv(s,buf,len,flags) pgwin32_recv(s, buf, len, flags)`
`371`	`373`	`#definesend(s,buf,len,flags) pgwin32_send(s, buf, len, flags)`
`372`	`374`
`373`	`375`	`SOCKETpgwin32_socket(intaf,inttype,intprotocol);`
	`376`	`+intpgwin32_bind(SOCKETs,structsockaddraddr,intaddrlen);`
	`377`	`+intpgwin32_listen(SOCKETs,intbacklog);`
`374`	`378`	`SOCKETpgwin32_accept(SOCKETs,structsockaddraddr,intaddrlen);`
`375`	`379`	`intpgwin32_connect(SOCKETs,conststructsockaddr*name,intnamelen);`
`376`	`380`	`intpgwin32_select(intnfds,fd_setreadfs,fd_setwritefds,fd_setexceptfds,conststructtimevaltimeout);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd1b7d48

File tree

2 files changed

2 files changed

`‎src/backend/port/win32/socket.c`

`‎src/include/port/win32.h`

0 commit comments