[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35253 - in gnunet/src: ats transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35253 - in gnunet/src: ats transport |
Date: |
Fri, 13 Feb 2015 01:11:53 +0100 |
Author: grothoff
Date: 2015-02-13 01:11:53 +0100 (Fri, 13 Feb 2015)
New Revision: 35253
Modified:
gnunet/src/ats/ats_api_scheduling.c
gnunet/src/ats/gnunet-service-ats_addresses.c
gnunet/src/ats/gnunet-service-ats_performance.c
gnunet/src/ats/gnunet-service-ats_reservations.c
gnunet/src/ats/plugin_ats_proportional.c
gnunet/src/transport/gnunet-service-transport_validation.c
gnunet/src/transport/gnunet-transport.c
gnunet/src/transport/plugin_transport_tcp.c
gnunet/src/transport/plugin_transport_unix.c
Log:
-fixing misc minor bugs and style issues (unchecked return values, memory
leaks, dead code
Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2015-02-13 00:01:39 UTC (rev 35252)
+++ gnunet/src/ats/ats_api_scheduling.c 2015-02-13 00:11:53 UTC (rev 35253)
@@ -491,9 +491,7 @@
if (NULL == sh->mq)
return; /* disconnected, skip for now */
- namelen = (NULL == ar->address->transport_name)
- ? 0
- : strlen (ar->address->transport_name) + 1;
+ namelen = strlen (ar->address->transport_name) + 1;
msize = ar->address->address_length + namelen;
ev = GNUNET_MQ_msg_extra (m, msize, GNUNET_MESSAGE_TYPE_ATS_ADDRESS_ADD);
m->peer = ar->address->peer;
@@ -671,9 +669,7 @@
GNUNET_break (0);
return NULL;
}
- namelen = (NULL == address->transport_name)
- ? 0
- : strlen (address->transport_name) + 1;
+ namelen = strlen (address->transport_name) + 1;
msize = address->address_length + namelen;
if ((msize + sizeof (struct AddressUpdateMessage) >=
GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
(address->address_length >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c 2015-02-13 00:01:39 UTC
(rev 35252)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c 2015-02-13 00:11:53 UTC
(rev 35253)
@@ -58,9 +58,10 @@
static void
free_address (struct ATS_Address *addr)
{
- GNUNET_CONTAINER_multipeermap_remove (GSA_addresses,
- &addr->peer,
- addr);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_remove (GSA_addresses,
+ &addr->peer,
+ addr));
update_addresses_stat ();
GAS_plugin_delete_address (addr);
GAS_performance_notify_all_clients (&addr->peer,
@@ -551,6 +552,7 @@
char *addrp;
size_t plugin_name_length;
size_t msize;
+ struct GNUNET_SERVER_NotificationContext **uc;
struct GNUNET_SERVER_NotificationContext *nc;
if (NULL != plugin_name)
@@ -587,13 +589,14 @@
memcpy (addrp, plugin_addr, plugin_addr_len);
if (NULL != plugin_name)
strcpy (&addrp[plugin_addr_len], plugin_name);
- nc = *GNUNET_SERVER_client_get_user_context (ai->client,
- struct
GNUNET_SERVER_NotificationContext *);
- if (NULL == nc)
+ uc = GNUNET_SERVER_client_get_user_context (ai->client,
+ struct
GNUNET_SERVER_NotificationContext *);
+ if (NULL == uc)
{
GNUNET_break (0);
return;
}
+ nc = *uc;
GNUNET_SERVER_notification_context_unicast (nc,
ai->client,
&msg->header,
Modified: gnunet/src/ats/gnunet-service-ats_performance.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_performance.c 2015-02-13 00:01:39 UTC
(rev 35252)
+++ gnunet/src/ats/gnunet-service-ats_performance.c 2015-02-13 00:11:53 UTC
(rev 35253)
@@ -76,6 +76,7 @@
plugin_addr_len +
plugin_name_length;
char buf[msize] GNUNET_ALIGN;
+ struct GNUNET_SERVER_NotificationContext **uc;
struct GNUNET_SERVER_NotificationContext *nc;
char *addrp;
@@ -108,13 +109,14 @@
}
else
{
- nc = *GNUNET_SERVER_client_get_user_context (client,
+ uc = GNUNET_SERVER_client_get_user_context (client,
struct
GNUNET_SERVER_NotificationContext *);
- if (NULL == nc)
+ if (NULL == uc)
{
GNUNET_break (0);
return;
}
+ nc = *uc;
GNUNET_SERVER_notification_context_unicast (nc,
client,
&msg->header,
Modified: gnunet/src/ats/gnunet-service-ats_reservations.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_reservations.c 2015-02-13 00:01:39 UTC
(rev 35252)
+++ gnunet/src/ats/gnunet-service-ats_reservations.c 2015-02-13 00:11:53 UTC
(rev 35253)
@@ -152,17 +152,19 @@
struct ReservationResultMessage result;
int32_t amount;
struct GNUNET_TIME_Relative res_delay;
+ struct GNUNET_SERVER_NotificationContext **uc;
struct GNUNET_SERVER_NotificationContext *nc;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received RESERVATION_REQUEST message\n");
- nc = *GNUNET_SERVER_client_get_user_context (client,
- struct
GNUNET_SERVER_NotificationContext *);
- if (NULL == nc)
+ uc = GNUNET_SERVER_client_get_user_context (client,
+ struct
GNUNET_SERVER_NotificationContext *);
+ if (NULL == uc)
{
GNUNET_break (0);
return;
}
+ nc = *uc;
amount = (int32_t) ntohl (msg->amount);
res_delay = reservations_reserve (&msg->peer, amount);
if (res_delay.rel_value_us > 0)
Modified: gnunet/src/ats/plugin_ats_proportional.c
===================================================================
--- gnunet/src/ats/plugin_ats_proportional.c 2015-02-13 00:01:39 UTC (rev
35252)
+++ gnunet/src/ats/plugin_ats_proportional.c 2015-02-13 00:11:53 UTC (rev
35253)
@@ -215,7 +215,7 @@
unsigned int na;
uint32_t min_bw = ntohl (GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT.value__);
- GNUNET_assert (net->active_addresses + extra >= 0);
+ GNUNET_assert (((int)net->active_addresses) + extra >= 0);
na = net->active_addresses + extra;
if (0 == na)
return GNUNET_YES;
Modified: gnunet/src/transport/gnunet-service-transport_validation.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_validation.c 2015-02-13
00:01:39 UTC (rev 35252)
+++ gnunet/src/transport/gnunet-service-transport_validation.c 2015-02-13
00:11:53 UTC (rev 35253)
@@ -578,6 +578,7 @@
ve->address->address,
ve->address->address_length);
papi = GST_plugins_find (ve->address->transport_name);
+ GNUNET_assert (NULL != papi);
session = papi->get_session (papi->cls,
ve->address);
if (NULL == session)
Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c 2015-02-13 00:01:39 UTC (rev
35252)
+++ gnunet/src/transport/gnunet-transport.c 2015-02-13 00:11:53 UTC (rev
35253)
@@ -940,23 +940,12 @@
_("Monitor disconnected from transport service.
Reconnecting.\n"));
return;
}
-
- /* done */
vic = NULL;
if (NULL != end)
GNUNET_SCHEDULER_cancel (end);
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
return;
}
- if (NULL == address)
- {
- /* invalid response */
- vic = NULL;
- if (NULL != end)
- GNUNET_SCHEDULER_cancel (end);
- end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
- return;
- }
resolve_validation_address (address,
numeric,
last_validation,
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2015-02-13 00:01:39 UTC (rev
35252)
+++ gnunet/src/transport/plugin_transport_tcp.c 2015-02-13 00:11:53 UTC (rev
35253)
@@ -1752,7 +1752,7 @@
plugin->cur_connections++;
if (plugin->cur_connections == plugin->max_connections)
{
- GNUNET_STATISTICS_update (session->plugin->env->stats,
+ GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# TCP service suspended"),
1,
GNUNET_NO);
@@ -2330,7 +2330,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("TCP connection limit reached, suspending server\n"));
- GNUNET_STATISTICS_update (session->plugin->env->stats,
+ GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# TCP service suspended"),
1,
GNUNET_NO);
Modified: gnunet/src/transport/plugin_transport_unix.c
===================================================================
--- gnunet/src/transport/plugin_transport_unix.c 2015-02-13 00:01:39 UTC
(rev 35252)
+++ gnunet/src/transport/plugin_transport_unix.c 2015-02-13 00:11:53 UTC
(rev 35253)
@@ -1383,6 +1383,7 @@
if (NULL == plugin->unix_sock.desc)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
+ GNUNET_free (un);
return GNUNET_SYSERR;
}
if ('\0' != un->sun_path[0])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35253 - in gnunet/src: ats transport,
gnunet <=