--- a/loudmouth/lm-connection.c Sun Jul 13 19:02:02 2008 +0200
+++ b/loudmouth/lm-connection.c Sun Jul 13 19:05:23 2008 +0200
@@ -411,7 +411,7 @@
/* try using TCP keepalives if possible */
if ((connection->keep_alive_rate > 0) &&
lm_old_socket_set_keepalive (connection->socket,
- connection->keep_alive_rate)) {
+ connection->keep_alive_rate)) {
#ifdef ONLY_TCP_KEEP_ALIVE
/* Many NAT firewalls seems to not handle this correctly and
* will disconnect the clients */
@@ -531,18 +531,18 @@
lm_verbose ("Connecting to: %s:%d\n", connection->server, connection->port);
connection->socket = lm_old_socket_create (connection->context,
- (IncomingDataFunc) connection_incoming_data,
- (SocketClosedFunc) connection_socket_closed_cb,
- (ConnectResultFunc) connection_socket_connect_cb,
- connection,
- connection,
- connection->blocking,
- connection->server,
- domain,
- connection->port,
- connection->ssl,
- connection->proxy,
- error);
+ (IncomingDataFunc) connection_incoming_data,
+ (SocketClosedFunc) connection_socket_closed_cb,
+ (ConnectResultFunc) connection_socket_connect_cb,
+ connection,
+ connection,
+ connection->blocking,
+ connection->server,
+ domain,
+ connection->port,
+ connection->ssl,
+ connection->proxy,
+ error);
g_free (domain);
--- a/loudmouth/lm-old-socket.c Sun Jul 13 19:02:02 2008 +0200
+++ b/loudmouth/lm-old-socket.c Sun Jul 13 19:05:23 2008 +0200
@@ -891,8 +891,8 @@
static gboolean
_lm_old_socket_resolver_done (GSource *source,
- GIOCondition condition,
- gpointer data)
+ GIOCondition condition,
+ gpointer data)
{
LmOldSocket *socket = lm_old_socket_ref ((LmOldSocket *) data);
struct addrinfo *ans;
@@ -934,8 +934,8 @@
static void
_lm_old_socket_create_phase1 (LmOldSocket *socket,
- unsigned char *srv_ans,
- int len)
+ unsigned char *srv_ans,
+ int len)
{
const char *remote_addr;
LmConnectData *data;
@@ -1030,18 +1030,18 @@
LmOldSocket *
lm_old_socket_create (GMainContext *context,
- IncomingDataFunc data_func,
- SocketClosedFunc closed_func,
- ConnectResultFunc connect_func,
- gpointer user_data,
- LmConnection *connection,
- gboolean blocking,
- const gchar *server,
- const gchar *domain,
- guint port,
- LmSSL *ssl,
- LmProxy *proxy,
- GError **error)
+ IncomingDataFunc data_func,
+ SocketClosedFunc closed_func,
+ ConnectResultFunc connect_func,
+ gpointer user_data,
+ LmConnection *connection,
+ gboolean blocking,
+ const gchar *server,
+ const gchar *domain,
+ guint port,
+ LmSSL *ssl,
+ LmProxy *proxy,
+ GError **error)
{
LmOldSocket *socket;
@@ -1084,8 +1084,9 @@
lm_verbose ("Performing a SRV lookup for %s\n", srv);
#ifdef HAVE_ASYNCNS
- if (!old_socket_asyncns_prep (socket, error))
- return NULL;
+ if (!old_socket_asyncns_prep (socket, error)) {
+ return NULL;
+ }
socket->resolv_query =
asyncns_res_query (socket->asyncns_ctx, srv, C_IN, T_SRV);