{
LPVOID lpMsgBuf;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpMsgBuf, 0, NULL);
- debug(("Error %ld: %s (h=%lx)\n", err, lpMsgBuf, h));
+ /*debug(("Error %ld: %s (h=%lx)\n", err, lpMsgBuf, h));*/
/* Free the buffer. */
LocalFree(lpMsgBuf);
}
sfree(addr);
}
-Socket sk_new(SockAddr addr, int port, sk_receiver_t receiver) {
+Socket sk_new(SockAddr addr, int port, int privport, sk_receiver_t receiver) {
SOCKET s;
#ifdef IPV6
SOCKADDR_IN6 a6;
char *errstr;
Socket ret;
extern char *do_select(SOCKET skt, int startup);
+ short localport;
/*
* Create Socket structure.
/*
* Bind to local address.
*/
-#ifdef IPV6
- if (addr->family == AF_INET6)
- {
- memset(&a6,0,sizeof(a6));
- a6.sin6_family = AF_INET6;
- /*a6.sin6_addr = in6addr_any;*/ /* == 0 */
- a6.sin6_port = htons(0);
- }
+ if (privport)
+ localport = 1023; /* count from 1023 downwards */
else
- {
+ localport = 0; /* just use port 0 (ie winsock picks) */
+
+ /* Loop round trying to bind */
+ while (1) {
+ int retcode;
+
+#ifdef IPV6
+ if (addr->family == AF_INET6)
+ {
+ memset(&a6,0,sizeof(a6));
+ a6.sin6_family = AF_INET6;
+ /*a6.sin6_addr = in6addr_any;*/ /* == 0 */
+ a6.sin6_port = htons(localport);
+ }
+ else
+ {
#endif
- a.sin_family = AF_INET;
- a.sin_addr.s_addr = htonl(INADDR_ANY);
- a.sin_port = htons(0);
+ a.sin_family = AF_INET;
+ a.sin_addr.s_addr = htonl(INADDR_ANY);
+ a.sin_port = htons(localport);
#ifdef IPV6
- }
- if (bind (s, (addr->family == AF_INET6) ? (struct sockaddr *)&a6 : (struct sockaddr *)&a, (addr->family == AF_INET6) ? sizeof(a6) : sizeof(a)) == SOCKET_ERROR)
+ }
+ retcode = bind (s, (addr->family == AF_INET6 ?
+ (struct sockaddr *)&a6 :
+ (struct sockaddr *)&a),
+ (addr->family == AF_INET6 ? sizeof(a6) : sizeof(a)));
#else
- if (bind (s, (struct sockaddr *)&a, sizeof(a)) == SOCKET_ERROR)
+ retcode = bind (s, (struct sockaddr *)&a, sizeof(a));
#endif
+ if (retcode != SOCKET_ERROR) {
+ err = 0;
+ break; /* done */
+ } else {
+ err = WSAGetLastError();
+ if (err != WSAEADDRINUSE) /* failed, for a bad reason */
+ break;
+ }
+
+ if (localport == 0)
+ break; /* we're only looping once */
+ localport--;
+ if (localport == 0)
+ break; /* we might have got to the end */
+ }
+
+ if (err)
{
- err = WSAGetLastError();
ret->error = winsock_error_string(err);
return ret;
}
}
void sk_close(Socket s) {
+ extern char *do_select(SOCKET skt, int startup);
+
del234(sktree, s);
do_select(s->s, 0);
closesocket(s->s);