projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
lib
/
silcutil
/
silcsockconn.c
diff --git
a/lib/silcutil/silcsockconn.c
b/lib/silcutil/silcsockconn.c
index 942b30d8664e37ef46b36fd9762d39ccce7219da..ad07a2b6cbb9943c8b9cef5b1fe1d32fcd4601a4 100644
(file)
--- a/
lib/silcutil/silcsockconn.c
+++ b/
lib/silcutil/silcsockconn.c
@@
-23,7
+23,7
@@
/* Heartbeat context */
struct SilcSocketConnectionHBStruct {
/* Heartbeat context */
struct SilcSocketConnectionHBStruct {
-
ui
nt32 heartbeat;
+
SilcUI
nt32 heartbeat;
SilcSocketConnectionHBCb hb_callback;
void *hb_context;
SilcSchedule schedule;
SilcSocketConnectionHBCb hb_callback;
void *hb_context;
SilcSchedule schedule;
@@
-77,6
+77,9
@@
void silc_socket_free(SilcSocketConnection sock)
silc_free(sock->hb);
}
silc_free(sock->hb);
}
+ silc_free(sock->ip);
+ silc_free(sock->hostname);
+
memset(sock, 'F', sizeof(*sock));
silc_free(sock);
}
memset(sock, 'F', sizeof(*sock));
silc_free(sock);
}
@@
-120,7
+123,7
@@
SILC_TASK_CALLBACK(silc_socket_heartbeat)
`schedule' is the application's scheduler. */
void silc_socket_set_heartbeat(SilcSocketConnection sock,
`schedule' is the application's scheduler. */
void silc_socket_set_heartbeat(SilcSocketConnection sock,
-
ui
nt32 heartbeat,
+
SilcUI
nt32 heartbeat,
void *hb_context,
SilcSocketConnectionHBCb hb_callback,
SilcSchedule schedule)
void *hb_context,
SilcSocketConnectionHBCb hb_callback,
SilcSchedule schedule)
@@
-224,10
+227,5
@@
void silc_socket_host_lookup(SilcSocketConnection sock,
lookup->port = port_lookup;
SILC_SET_HOST_LOOKUP(sock);
lookup->port = port_lookup;
SILC_SET_HOST_LOOKUP(sock);
-
-#ifdef SILC_THREADS
silc_thread_create(silc_socket_host_lookup_start, lookup, FALSE);
silc_thread_create(silc_socket_host_lookup_start, lookup, FALSE);
-#else
- silc_socket_host_lookup_start((void *)lookup);
-#endif
}
}