Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit20d4428

Browse files
committed
Provide errno-translation wrappers around bind() and listen() on Windows.
Fix Windows builds to report something useful rather than "could not bindIPv4 socket: No error" when bind() fails.Back-patch of commitsd1b7d48 and22989a8.Discussion: <4065.1452450340@sss.pgh.pa.us>
1 parent4b52cc2 commit20d4428

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
*/
2828
intpgwin32_noblock=0;
2929

30+
/* Undef the macros defined in win32.h, so we can access system functions */
3031
#undef socket
32+
#undef bind
33+
#undef listen
3134
#undef accept
3235
#undef connect
3336
#undef select
@@ -261,6 +264,27 @@ pgwin32_socket(int af, int type, int protocol)
261264
returns;
262265
}
263266

267+
int
268+
pgwin32_bind(SOCKETs,structsockaddr*addr,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+
}
264288

265289
SOCKET
266290
pgwin32_accept(SOCKETs,structsockaddr*addr,int*addrlen)

‎src/include/port/win32.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,13 +364,17 @@ voidpg_queue_signal(int signum);
364364
/* In backend/port/win32/socket.c */
365365
#ifndefFRONTEND
366366
#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)
367369
#defineaccept(s,addr,addrlen) pgwin32_accept(s, addr, addrlen)
368370
#defineconnect(s,name,namelen) pgwin32_connect(s, name, namelen)
369371
#defineselect(n,r,w,e,timeout) pgwin32_select(n, r, w, e, timeout)
370372
#definerecv(s,buf,len,flags) pgwin32_recv(s, buf, len, flags)
371373
#definesend(s,buf,len,flags) pgwin32_send(s, buf, len, flags)
372374

373375
SOCKETpgwin32_socket(intaf,inttype,intprotocol);
376+
intpgwin32_bind(SOCKETs,structsockaddr*addr,intaddrlen);
377+
intpgwin32_listen(SOCKETs,intbacklog);
374378
SOCKETpgwin32_accept(SOCKETs,structsockaddr*addr,int*addrlen);
375379
intpgwin32_connect(SOCKETs,conststructsockaddr*name,intnamelen);
376380
intpgwin32_select(intnfds,fd_set*readfs,fd_set*writefds,fd_set*exceptfds,conststructtimeval*timeout);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp