[GNUnet-SVN] r37841 - gnunet/src/util

[gnunet]

Author: dold
Date: 2016-08-29 15:36:22 +0200 (Mon, 29 Aug 2016)
New Revision: 37841

Modified:
   gnunet/src/util/service_new.c
Log:
setup code for new service api

Modified: gnunet/src/util/service_new.c
===================================================================
--- gnunet/src/util/service_new.c       2016-08-29 13:29:42 UTC (rev 37840)
+++ gnunet/src/util/service_new.c       2016-08-29 13:36:22 UTC (rev 37841)
@@ -454,8 +454,8 @@
  *              zero (in this case, `*addrs` and `*addr_lens` will be
  *              set to NULL).
  */
-int
-GNUNET_SERVICE_get_server_addresses (const char *service_name,
+static int
+get_server_addresses (const char *service_name,
                                      const struct GNUNET_CONFIGURATION_Handle 
*cfg,
                                      struct sockaddr ***addrs,
                                      socklen_t ** addr_lens)
@@ -1058,7 +1058,7 @@
     socklen_t *addrlens;
     int num;
 
-    num = GNUNET_SERVICE_get_server_addresses (sh->service_name, sh->cfg,
+    num = get_server_addresses (sh->service_name, sh->cfg,
                                                &addrs, &addrlens)));
     if (GNUNET_SYSERR == num)
       return GNUNET_SYSERR;
@@ -1074,11 +1074,6 @@
     }
   }
 
-  if ((NULL == sh->lsocks) &&
-      (GNUNET_SYSERR ==
-       GNUNET_SERVICE_get_server_addresses (sh->service_name, sh->cfg,
-                                            &sh->addrs, &sh->addrlens)))
-    return GNUNET_SYSERR;
   sh->require_found = tolerant ? GNUNET_NO : GNUNET_YES;
   sh->match_uid =
       GNUNET_CONFIGURATION_get_value_yesno (sh->cfg, sh->service_name,