aboutsummaryrefslogtreecommitdiff
path: root/src/arm
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-10-23 10:06:07 +0000
committerChristian Grothoff <christian@grothoff.org>2011-10-23 10:06:07 +0000
commitf76e7c10d09a037ffd102a0f4998ba86c5e14f97 (patch)
tree7e60558b8dfb8223c0b2dc6e9ddcbe9d18bf5e4f /src/arm
parentf44c0036572d5557d2496748a4190a61e40e61ff (diff)
downloadgnunet-f76e7c10d09a037ffd102a0f4998ba86c5e14f97.tar.gz
gnunet-f76e7c10d09a037ffd102a0f4998ba86c5e14f97.zip
getting rid of unnecessary ignore_shutdown calls
Diffstat (limited to 'src/arm')
-rw-r--r--src/arm/arm_api.c3
-rw-r--r--src/arm/test_exponential_backoff.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index 6d6cb978f..c15c59875 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -470,7 +470,6 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
470 GNUNET_CLIENT_disconnect (sc->h->client, GNUNET_NO); 470 GNUNET_CLIENT_disconnect (sc->h->client, GNUNET_NO);
471 sc->h->client = GNUNET_CLIENT_connect ("arm", sc->h->cfg); 471 sc->h->client = GNUNET_CLIENT_connect ("arm", sc->h->cfg);
472 GNUNET_assert (NULL != sc->h->client); 472 GNUNET_assert (NULL != sc->h->client);
473 GNUNET_CLIENT_ignore_shutdown (sc->h->client, GNUNET_YES);
474 if (sc->callback != NULL) 473 if (sc->callback != NULL)
475 sc->callback (sc->cls, GNUNET_SYSERR); 474 sc->callback (sc->cls, GNUNET_SYSERR);
476 GNUNET_free (sc); 475 GNUNET_free (sc);
@@ -618,7 +617,6 @@ GNUNET_ARM_start_service (struct GNUNET_ARM_Handle *h, const char *service_name,
618 } 617 }
619 LOG (GNUNET_ERROR_TYPE_DEBUG, 618 LOG (GNUNET_ERROR_TYPE_DEBUG,
620 "arm_api, GNUNET_CLIENT_connect returned non-NULL\n"); 619 "arm_api, GNUNET_CLIENT_connect returned non-NULL\n");
621 GNUNET_CLIENT_ignore_shutdown (client, GNUNET_YES);
622 h->client = client; 620 h->client = client;
623 } 621 }
624 LOG (GNUNET_ERROR_TYPE_DEBUG, "arm_api, h->client non-NULL\n"); 622 LOG (GNUNET_ERROR_TYPE_DEBUG, "arm_api, h->client non-NULL\n");
@@ -673,7 +671,6 @@ GNUNET_ARM_stop_service (struct GNUNET_ARM_Handle *h, const char *service_name,
673 cb (cb_cls, GNUNET_SYSERR); 671 cb (cb_cls, GNUNET_SYSERR);
674 return; 672 return;
675 } 673 }
676 GNUNET_CLIENT_ignore_shutdown (client, GNUNET_YES);
677 h->client = client; 674 h->client = client;
678 } 675 }
679 if (0 == strcasecmp ("arm", service_name)) 676 if (0 == strcasecmp ("arm", service_name))
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index ec2f4545d..3ff4d284f 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -188,7 +188,7 @@ write_shutdown (void *cls, size_t size, void *buf)
188 188
189 if (size < sizeof (struct GNUNET_MessageHeader)) 189 if (size < sizeof (struct GNUNET_MessageHeader))
190 { 190 {
191 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 191 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
192 _("Failed to transmit shutdown request to client.\n")); 192 _("Failed to transmit shutdown request to client.\n"));
193 shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_SYSERR); 193 shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_SYSERR);
194 GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO); 194 GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);