ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/lowlevel.C
(Generate patch)

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.3 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.4 by root, Wed Aug 30 16:30:37 2006 UTC

1 1
2/* 2/*
3 * static char *rcsid_sockets_c = 3 * static char *rcsid_sockets_c =
4 * "$Id: lowlevel.C,v 1.3 2006/08/29 08:01:38 root Exp $"; 4 * "$Id: lowlevel.C,v 1.4 2006/08/30 16:30:37 root Exp $";
5 */ 5 */
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
9 9
176 } 176 }
177 return -1; /* kick this user! */ 177 return -1; /* kick this user! */
178 } 178 }
179#else 179#else
180 if (errno != EAGAIN && errno !=EWOULDBLOCK) { 180 if (errno != EAGAIN && errno !=EWOULDBLOCK) {
181 LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno)); 181 LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror(errno));
182 } 182 }
183#endif 183#endif
184 return 0; /*Error */ 184 return 0; /*Error */
185 } 185 }
186 if (stat==0) return -1; 186 if (stat==0) return -1;
231 } 231 }
232 return -1; /* kick this user! */ 232 return -1; /* kick this user! */
233 } 233 }
234#else 234#else
235 if (errno != EAGAIN && errno !=EWOULDBLOCK) { 235 if (errno != EAGAIN && errno !=EWOULDBLOCK) {
236 LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno)); 236 LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror(errno));
237 } 237 }
238#endif 238#endif
239 return 0; /*Error */ 239 return 0; /*Error */
240 } 240 }
241 if (stat==0) return -1; 241 if (stat==0) return -1;
336 if (amt == -1 && WSAGetLastError() !=WSAEWOULDBLOCK) { 336 if (amt == -1 && WSAGetLastError() !=WSAEWOULDBLOCK) {
337 LOG(llevError,"New socket write failed (wsb) (%d).\n", WSAGetLastError()); 337 LOG(llevError,"New socket write failed (wsb) (%d).\n", WSAGetLastError());
338#else 338#else
339 if (errno !=EWOULDBLOCK) { 339 if (errno !=EWOULDBLOCK) {
340 LOG(llevError,"New socket write failed (wsb) (%d: %s).\n", 340 LOG(llevError,"New socket write failed (wsb) (%d: %s).\n",
341 errno, strerror_local(errno)); 341 errno, strerror(errno));
342#endif 342#endif
343 ns->status=Ns_Dead; 343 ns->status=Ns_Dead;
344 return; 344 return;
345 } 345 }
346 else { /* EWOULDBLOCK */ 346 else { /* EWOULDBLOCK */
399 if (amt == -1 && WSAGetLastError() !=WSAEWOULDBLOCK) { 399 if (amt == -1 && WSAGetLastError() !=WSAEWOULDBLOCK) {
400 LOG(llevError,"New socket write failed WTS (%d).\n",WSAGetLastError()); 400 LOG(llevError,"New socket write failed WTS (%d).\n",WSAGetLastError());
401#else 401#else
402 if (errno !=EWOULDBLOCK) { 402 if (errno !=EWOULDBLOCK) {
403 LOG(llevError,"New socket write failed WTS (%d: %s).\n", /* ---WIN32 */ 403 LOG(llevError,"New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
404 errno, strerror_local(errno)); 404 errno, strerror(errno));
405#endif 405#endif
406 ns->status=Ns_Dead; 406 ns->status=Ns_Dead;
407 return; 407 return;
408 } 408 }
409 else { /* EWOULDBLOCK */ 409 else { /* EWOULDBLOCK */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines