API tools faq
paste
Advertisement
gorlak

socket_portable patch for bind()

gorlak
Jul 3rd, 2013
76
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.61 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/panda/src/nativenet/socket_portable.h b/panda/src/nativenet/socket_portable.h
  2. index 91f033c..9907ca4 100644
  3. --- a/panda/src/nativenet/socket_portable.h
  4. +++ b/panda/src/nativenet/socket_portable.h
  5. @@ -50,54 +50,54 @@ typedef unsigned long SOCKET;
  6.  
  7. inline int DO_SELECT(SOCKET n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,struct timeval *timeout)
  8. {
  9. - return select((int) n, readfds, writefds, exceptfds,timeout);
  10. + return ::select((int) n, readfds, writefds, exceptfds,timeout);
  11. }
  12.  
  13. inline int DO_CONNECT( const SOCKET a, const struct sockaddr_in *b)
  14. {
  15. - return connect(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  16. + return ::connect(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  17. }
  18. inline int DO_SOCKET_READ(const SOCKET a, char * buf, const int size)
  19. {
  20. - return recv(a, buf, size, 0);
  21. + return ::recv(a, buf, size, 0);
  22. }
  23. inline int DO_SOCKET_WRITE(const SOCKET a, const char * buff, const int len)
  24. {
  25. - return send(a, buff, len, 0);
  26. + return ::send(a, buff, len, 0);
  27. }
  28. inline int DO_SOCKET_WRITE_TO(const SOCKET a, const char * buffer, const int buf_len, const sockaddr_in * addr)
  29. {
  30. - return sendto(a, buffer, buf_len, 0, reinterpret_cast<const struct ::sockaddr *>(addr), sizeof(sockaddr));
  31. + return ::sendto(a, buffer, buf_len, 0, reinterpret_cast<const struct ::sockaddr *>(addr), sizeof(sockaddr));
  32. }
  33. inline SOCKET DO_NEWUDP()
  34. {
  35. - return socket(AF_INET, SOCK_DGRAM, 0);
  36. + return ::socket(AF_INET, SOCK_DGRAM, 0);
  37. }
  38. inline SOCKET DO_NEWTCP()
  39. {
  40. - return socket(AF_INET, SOCK_STREAM, 0);
  41. + return ::socket(AF_INET, SOCK_STREAM, 0);
  42. }
  43. inline int DO_BIND(const SOCKET a, const sockaddr_in *b)
  44. {
  45. - return bind(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  46. + return ::bind(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  47. }
  48. inline int DO_CLOSE(const SOCKET a)
  49. {
  50. - return closesocket(a);
  51. + return ::closesocket(a);
  52. }
  53. inline SOCKET DO_ACCEPT(SOCKET sck, sockaddr_in * adr)
  54. {
  55. int adrlen = sizeof(sockaddr);
  56. - return accept(sck, reinterpret_cast<sockaddr *>(adr), &adrlen);
  57. + return ::accept(sck, reinterpret_cast<sockaddr *>(adr), &adrlen);
  58. };
  59. inline int DO_RECV_FROM(SOCKET sck, char * data, int len, sockaddr_in * addr)
  60. {
  61. int plen = sizeof(sockaddr);
  62. - return recvfrom(sck, data, len, 0, reinterpret_cast<sockaddr *>(addr), &plen);
  63. + return ::recvfrom(sck, data, len, 0, reinterpret_cast<sockaddr *>(addr), &plen);
  64. }
  65. inline int DO_LISTEN(const SOCKET a, const int size)
  66. {
  67. - return listen(a, size);
  68. + return ::listen(a, size);
  69. }
  70.  
  71. inline int GETERROR()
  72. @@ -107,7 +107,7 @@ inline int GETERROR()
  73.  
  74. inline int SOCKIOCTL(const SOCKET s, const long flags, unsigned long * val)
  75. {
  76. - return ioctlsocket(s, flags, val);
  77. + return ::ioctlsocket(s, flags, val);
  78. }
  79.  
  80. inline int init_network()
  81. @@ -122,7 +122,7 @@ inline int init_network()
  82.  
  83. inline bool do_shutdown_send(SOCKET s)
  84. {
  85. - return (shutdown(s,SD_SEND) == 0);
  86. + return (::shutdown(s,SD_SEND) == 0);
  87. };
  88.  
  89. typedef int socklen_t ;
  90. @@ -165,15 +165,15 @@ const SOCKET BAD_SOCKET = 0xffffffff;
  91.  
  92. inline int DO_CONNECT(const SOCKET a, const sockaddr_in *b)
  93. {
  94. - return connect(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  95. + return ::connect(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  96. }
  97. inline int DO_SOCKET_READ(const SOCKET a, char * buf, const int size)
  98. {
  99. - return recv(a, buf, size, 0);
  100. + return ::recv(a, buf, size, 0);
  101. }
  102. inline int DO_SOCKET_WRITE(const SOCKET a, const char * buff, const int len)
  103. {
  104. - return send(a, buff, len, 0);
  105. + return ::send(a, buff, len, 0);
  106. }
  107.  
  108. //#define DO_SOCKET_WRITE_TO(a,b,c,d) sendto(a,b,c,0,(sockaddr *)d,sizeof(sockaddr))
  109. @@ -183,38 +183,38 @@ inline int DO_SOCKET_WRITE(const SOCKET a, const char * buff, const int len)
  110. //#/define DO_CLOSE(a) close(a)
  111. inline int DO_SOCKET_WRITE_TO(const SOCKET a, const char * buffer, const int buf_len, const sockaddr_in * addr)
  112. {
  113. - return sendto(a, buffer, buf_len, 0, reinterpret_cast<const struct ::sockaddr *>(addr), sizeof(sockaddr));
  114. + return ::sendto(a, buffer, buf_len, 0, reinterpret_cast<const struct ::sockaddr *>(addr), sizeof(sockaddr));
  115. }
  116. inline SOCKET DO_NEWUDP()
  117. {
  118. - return socket(AF_INET, SOCK_DGRAM, 0);
  119. + return ::socket(AF_INET, SOCK_DGRAM, 0);
  120. }
  121. inline SOCKET DO_NEWTCP()
  122. {
  123. - return socket(AF_INET, SOCK_STREAM, 0);
  124. + return ::socket(AF_INET, SOCK_STREAM, 0);
  125. }
  126. inline int DO_BIND(const SOCKET a, const sockaddr_in *b)
  127. {
  128. - return bind(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  129. + return ::bind(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  130. }
  131. inline int DO_CLOSE(const SOCKET a)
  132. {
  133. - return close(a);
  134. + return ::close(a);
  135. }
  136. inline int DO_ACCEPT(SOCKET sck, sockaddr_in * adr)
  137. {
  138. int adrlen = sizeof(sockaddr);
  139. - return accept(sck, ( sockaddr *)adr, &adrlen);
  140. + return ::accept(sck, ( sockaddr *)adr, &adrlen);
  141. };
  142.  
  143. inline int DO_RECV_FROM(SOCKET sck, char * data, int len, sockaddr_in * addr)
  144. {
  145. int plen = sizeof(sockaddr);
  146. - return recvfrom(sck, data, len, 0, (sockaddr *)addr, &plen);
  147. + return ::recvfrom(sck, data, len, 0, (sockaddr *)addr, &plen);
  148. }
  149. inline int DO_LISTEN(const SOCKET a, const int size)
  150. {
  151. - return listen(a, size);
  152. + return ::listen(a, size);
  153. }
  154.  
  155. inline int GETERROR()
  156. @@ -224,7 +224,7 @@ inline int GETERROR()
  157.  
  158. inline int SOCKIOCTL(const SOCKET s, const long flags, void * val)
  159. {
  160. - return ioctl(s, flags, val);
  161. + return ::ioctl(s, flags, val);
  162. }
  163.  
  164. inline int init_network()
  165. @@ -270,53 +270,53 @@ typedef int SOCKET;
  166. const SOCKET BAD_SOCKET = -1;
  167. inline int DO_SELECT(SOCKET n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,struct timeval *timeout)
  168. {
  169. - return select((int) n, readfds, writefds, exceptfds,timeout);
  170. + return ::select((int) n, readfds, writefds, exceptfds,timeout);
  171. }
  172.  
  173. inline int DO_CONNECT(const SOCKET a, const sockaddr_in *b)
  174. {
  175. - return connect(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  176. + return ::connect(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  177. }
  178. inline int DO_SOCKET_READ(const SOCKET a, char * buf, const int size)
  179. {
  180. - return recv(a, buf, size, 0);
  181. + return ::recv(a, buf, size, 0);
  182. }
  183. inline int DO_SOCKET_WRITE(const SOCKET a, const char * buff, const int len)
  184. {
  185. - return send(a, buff, len, 0);
  186. + return ::send(a, buff, len, 0);
  187. }
  188. ///////////////////////////////////////////////
  189. inline int DO_SOCKET_WRITE_TO(const SOCKET a, const char * buffer, const int buf_len, const sockaddr_in * addr)
  190. {
  191. - return sendto(a, buffer, buf_len, 0, reinterpret_cast<const struct ::sockaddr *>(addr), sizeof(sockaddr));
  192. + return ::sendto(a, buffer, buf_len, 0, reinterpret_cast<const struct ::sockaddr *>(addr), sizeof(sockaddr));
  193. }
  194. inline SOCKET DO_NEWUDP()
  195. {
  196. - return socket(AF_INET, SOCK_DGRAM, 0);
  197. + return ::socket(AF_INET, SOCK_DGRAM, 0);
  198. }
  199. inline SOCKET DO_NEWTCP()
  200. {
  201. - return socket(AF_INET, SOCK_STREAM, 0);
  202. + return ::socket(AF_INET, SOCK_STREAM, 0);
  203. }
  204. inline int DO_BIND(const SOCKET a, const sockaddr_in *b)
  205. {
  206. - return bind(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  207. + return ::bind(a, reinterpret_cast<const struct ::sockaddr *>(b), sizeof(sockaddr));
  208. }
  209. inline int DO_CLOSE(const SOCKET a)
  210. {
  211. - return close(a);
  212. + return ::close(a);
  213. }
  214.  
  215. inline int DO_ACCEPT(SOCKET sck, sockaddr_in * adr)
  216. {
  217. unsigned int adrlen = sizeof(sockaddr);
  218. - return accept(sck, ( sockaddr *)adr, &adrlen);
  219. + return ::accept(sck, ( sockaddr *)adr, &adrlen);
  220. };
  221.  
  222. inline int DO_RECV_FROM(SOCKET sck, char * data, int len, sockaddr_in * addr)
  223. {
  224. unsigned int plen = sizeof(sockaddr);
  225. - return recvfrom(sck, data, len, 0, (sockaddr *)addr, &plen);
  226. + return ::recvfrom(sck, data, len, 0, (sockaddr *)addr, &plen);
  227. }
  228.  
  229.  
  230. @@ -328,7 +328,7 @@ inline int init_network()
  231.  
  232. inline int DO_LISTEN(const SOCKET a, const int size)
  233. {
  234. - return listen(a, size);
  235. + return ::listen(a, size);
  236. }
  237.  
  238. inline int GETERROR()
  239. @@ -338,12 +338,12 @@ inline int GETERROR()
  240.  
  241. inline int SOCKIOCTL(const SOCKET s, const long flags, void * val)
  242. {
  243. - return ioctl(s, flags, val);
  244. + return ::ioctl(s, flags, val);
  245. }
  246.  
  247. inline bool do_shutdown_send(SOCKET s)
  248. {
  249. - return (shutdown(s,SHUT_WR) == 0);
  250. + return (::shutdown(s,SHUT_WR) == 0);
  251. };
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!