- Update to 1.1.2

This commit is contained in:
Edward Tomasz Napierala 2007-12-16 13:51:28 +00:00
parent b47116f53f
commit e18bbb441d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=203853
3 changed files with 42 additions and 4 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= wire
PORTVERSION= 1.1.1
PORTVERSION= 1.1.2
CATEGORIES= net
MASTER_SITES= http://www.zankasoftware.com/dist/ \
${MASTER_SITE_LOCAL}

View File

@ -1,3 +1,3 @@
MD5 (wire-1.1.1.tar.gz) = 982c80ef9b539f2e81a0fdd63db82340
SHA256 (wire-1.1.1.tar.gz) = 62c7923e967d13513bd9397e41613e31d8432b7c0816eb09f457290e69e1864c
SIZE (wire-1.1.1.tar.gz) = 698584
MD5 (wire-1.1.2.tar.gz) = 3984b88c8c56e31e87b2fd69a265465f
SHA256 (wire-1.1.2.tar.gz) = a8c940888338eacd4022267b26ac168347bb64032bf73594a20bd319d81947ab
SIZE (wire-1.1.2.tar.gz) = 295643

View File

@ -0,0 +1,38 @@
--- wire/client.c (revision 5082)
+++ wire/client.c (revision 5145)
@@ -216,13 +216,20 @@
wi_address_set_port(address, port);
- socket = wi_socket_init_with_address(wi_socket_alloc(), address, WI_SOCKET_TCP);
+ socket = wi_autorelease(wi_socket_init_with_address(wi_socket_alloc(), address, WI_SOCKET_TCP));
+
+ if(!socket) {
+ wr_printf_prefix(WI_STR("Could not open a socket to %@: %m"), ip);
+
+ continue;
+ }
+
wi_socket_set_interactive(socket, true);
if(!wi_socket_connect(socket, wr_socket_context, 10.0)) {
wr_printf_prefix(WI_STR("Could not connect to %@: %m"), ip);
- goto next;
+ continue;
}
wr_printf_prefix(WI_STR("Connected using %@/%@/%u bits, logging in..."),
@@ -241,11 +248,7 @@
wr_runloop_add_socket(wr_socket, &wr_runloop_server_callback);
wr_send_command(WI_STR("HELLO"));
-next:
- wi_release(socket);
-
- if(wr_connected)
- break;
+ break;
}
if(wr_socket)