gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnunet] branch master updated (f88e07fcc -> ee105432a)


From: gnunet
Subject: [gnunet] branch master updated (f88e07fcc -> ee105432a)
Date: Thu, 07 Dec 2023 15:51:09 +0100

This is an automated email from the git hooks/post-receive script.

sebi pushed a change to branch master
in repository gnunet.

    from f88e07fcc TRANSPORT: Uncrustify and remove single-statement function
     new bd2e6885b GANA protocol & service-port numbers
     new e70abe23d Fix compiler warning URI records & Resource leaks
     new 241179d6b Fix compiler warning URI records & Resource leaks
     new db896ea31 improved readability
     new 783f43d81 Fix memory leaks in resolver_lookup_get_next_label() function
     new 6404b1ff3 Fix memory leaks in resolver_lookup_get_next_label() function
     new 00e209724 Fix in DNS parser
     new a9822f4d2 Uncrustify
     new ee105432a Refactor resolver_getprotobyname and resolver_getservbyname 
functions

The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bootstrap                                        |   8 ++
 contrib/gana                                     |   2 +-
 src/cli/gns/test_gns_lightest.sh                 |  16 ++--
 src/cli/namestore/test_namestore_box_lightest.sh |   8 +-
 src/include/gnu_name_system_protocols.h          |  96 +++++++++++++++++++++
 src/include/gnu_name_system_service_ports.h      | 104 +++++++++++++++++++++++
 src/lib/util/dnsparser.c                         |  14 +--
 src/plugin/gnsrecord/plugin_gnsrecord_dns.c      |  17 ++--
 src/service/gns/gnunet-service-gns_resolver.c    |  49 +++++------
 9 files changed, 259 insertions(+), 55 deletions(-)
 mode change 100644 => 100755 src/cli/namestore/test_namestore_box_lightest.sh
 create mode 100644 src/include/gnu_name_system_protocols.h
 create mode 100644 src/include/gnu_name_system_service_ports.h

diff --git a/bootstrap b/bootstrap
index 69e524bd9..b2b6e439e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -149,6 +149,14 @@ gana_update()
       cd ../gnu-name-system-default-tlds && \
          make >/dev/null && \
          cp tlds.conf ../../../src/service/gns || exit 1
+      echo "Creating default GNS protocol numbers"
+      cd ../gns-protocol-numbers && \
+         make >/dev/null && \
+         cp gnu_name_system_protocols.h ../../../src/include/ || exit 1
+      echo "Creating default GNS service port nummbers"
+      cd ../gns-service-port-numbers && \
+         make >/dev/null && \
+         cp gnu_name_system_service_ports.h ../../../src/include/ || exit 1
 
       # Signatures
       echo "Updating GNUnet signatures"
diff --git a/contrib/gana b/contrib/gana
index 840792da1..557051695 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 840792da1b88e826a178df77a48f42b0b58a2570
+Subproject commit 557051695c575b45fb1bfdbacbc69d67c6908425
diff --git a/src/cli/gns/test_gns_lightest.sh b/src/cli/gns/test_gns_lightest.sh
index 03c313a7b..923cb92e9 100755
--- a/src/cli/gns/test_gns_lightest.sh
+++ b/src/cli/gns/test_gns_lightest.sh
@@ -28,12 +28,12 @@ TEST_PTR="$SCHEME.$TRUST.$LABEL.$MY_EGO"
 TEST_PTR2="$TRUSTLIST.$TRUST.$LABEL.$MY_EGO"
 gnunet-arm -s -c test_gns_lookup.conf
 gnunet-identity -C $MY_EGO -c test_gns_lookup.conf
-gnunet-namestore -p -z $MY_EGO -a -n $PTR_LABEL -t BOX -V "242 1003 12 
$TEST_PTR" -e never -c test_gns_lookup.conf
-gnunet-namestore -p -z $MY_EGO -a -n $PTR_LABEL -t BOX -V "242 1002 12 
$TEST_PTR2" -e never -c test_gns_lookup.conf
-gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "242 1003 256 $TEST_URI" 
-e never -c test_gns_lookup.conf
-gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "242 1003 53 
$TEST_SMIMEA" -e never -c test_gns_lookup.conf
-gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "242 1002 256 $TEST_URI" 
-e never -c test_gns_lookup.conf
-gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "242 1002 53 
$TEST_SMIMEA" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $PTR_LABEL -t BOX -V "49152 49152 12 
$TEST_PTR" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $PTR_LABEL -t BOX -V "49152 49153 12 
$TEST_PTR2" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "49152 49152 256 
$TEST_URI" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "49152 49152 53 
$TEST_SMIMEA" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "49152 49153 256 
$TEST_URI" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "49152 49153 53 
$TEST_SMIMEA" -e never -c test_gns_lookup.conf
 sleep 0.5
 PTR_SCHEME=`$DO_TIMEOUT gnunet-gns --raw -u $SCHEME.$TRUST.$PTR_LABEL.$MY_EGO 
-t PTR -c test_gns_lookup.conf`
 PTR_TRUSTLIST=`$DO_TIMEOUT gnunet-gns --raw -u 
$TRUSTLIST.$TRUST.$PTR_LABEL.$MY_EGO -t PTR -c test_gns_lookup.conf`
@@ -104,9 +104,9 @@ else
   echo "Resolved to proper SMIMEA, got '$RES_SMIMEA_TRUSTLIST'."
 fi
 
-gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "242 1003 256 10 1 
\"thisisnotavaliduri\"" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "49152 49152 256 10 1 
\"thisisnotavaliduri\"" -e never -c test_gns_lookup.conf
 status=$?
-gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "242 1003 256 10 1 
mailto:thisrecordismilformed@test.com"; -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "49152 49152 256 10 1 
mailto:thisrecordismalformed@test.com"; -e never -c test_gns_lookup.conf
 status2=$?
 
 if [ "$status" = "0" ]
diff --git a/src/cli/namestore/test_namestore_box_lightest.sh 
b/src/cli/namestore/test_namestore_box_lightest.sh
old mode 100644
new mode 100755
index add966f8f..3c8ad2799
--- a/src/cli/namestore/test_namestore_box_lightest.sh
+++ b/src/cli/namestore/test_namestore_box_lightest.sh
@@ -16,8 +16,8 @@ fi
 
 rm -rf `$LOCATION -c $CONFIGURATION -s PATHS -o GNUNET_HOME`
 TEST_RECORD_NAME_DNS="trust"
-TEST_RECORD_VALUE_SMIMEA="1002 242 53 0 0 1 
d2abde240d7cd3ee6b4b28c54df034b97983a1d16e8a410e4561cb106618e971"
-TEST_RECORD_VALUE_URI='1003 242 256 10 10 "http://lightest.nletlabs.nl/";'
+TEST_RECORD_VALUE_SMIMEA="49152 49153 53 0 0 1 
d2abde240d7cd3ee6b4b28c54df034b97983a1d16e8a410e4561cb106618e971"
+TEST_RECORD_VALUE_URI="49152 49152 256 10 10 \"http://lightest.nletlabs.nl/\"";
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 
 function start_peer
@@ -35,7 +35,7 @@ function stop_peer
 
 start_peer
 # Create a public SMIMEA record
-gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t A -V 
$TEST_RECORD_VALUE_SMIMEA -e never -c $CONFIGURATION
+gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t BOX -V 
"$TEST_RECORD_VALUE_SMIMEA" -e never -c $CONFIGURATION
 NAMESTORE_RES=$?
 
 if [ $NAMESTORE_RES = 0 ]
@@ -48,7 +48,7 @@ else
 fi
 
 # Create a public URI record
-gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t A -V 
$TEST_RECORD_VALUE_URI -e never -c $CONFIGURATION
+gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t BOX -V 
"$TEST_RECORD_VALUE_URI" -e never -c $CONFIGURATION
 NAMESTORE_RES=$?
 
 if [ $NAMESTORE_RES = 0 ]
diff --git a/src/include/gnu_name_system_protocols.h 
b/src/include/gnu_name_system_protocols.h
new file mode 100644
index 000000000..c10eef468
--- /dev/null
+++ b/src/include/gnu_name_system_protocols.h
@@ -0,0 +1,96 @@
+/*
+     This file is part of GNUnet
+     Copyright (C) 2012-2023 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+#ifndef GNUNET_GNS_PROTOCOLS_H
+#define GNUNET_GNS_PROTOCOLS_H
+
+/**
+ * WARNING:
+ * This header is generated!
+ * In order to add GNS service ports, you must register
+ * them in GANA, and then use the header generation script
+ * to create an update of this file. You may then replace this
+ * file with the update.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+struct GNUNET_GNS_Protocol
+{
+  const char *name;
+
+  uint16_t number;
+};
+
+struct GNUNET_GNS_Protocol GNUNET_GNS_Protocols[] = {
+  /**
+   * LIGHTest trust policy scheme
+   */
+  {
+    .name = "trust",
+    .number = 49152
+  },
+
+  {
+    .name = NULL,
+    .number = 0
+  }
+};
+
+uint16_t
+GNUNET_GNS_protocol_name_to_number (const char *name)
+{
+  int i = 0;
+  while (NULL != GNUNET_GNS_Protocols[i].name)
+  {
+    if (0 == strcmp (name, GNUNET_GNS_Protocols[i].name))
+      return GNUNET_GNS_Protocols[i].number;
+    i++;
+  }
+  return 0;
+}
+
+
+const char*
+GNUNET_GNS_protocol_number_to_name (uint16_t number)
+{
+  int i = 0;
+  while (NULL != GNUNET_GNS_Protocols[i].name)
+  {
+    if (number == GNUNET_GNS_Protocols[i].number)
+      return GNUNET_GNS_Protocols[i].name;
+    i++;
+  }
+  return NULL;
+}
+
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/include/gnu_name_system_service_ports.h 
b/src/include/gnu_name_system_service_ports.h
new file mode 100644
index 000000000..a95941882
--- /dev/null
+++ b/src/include/gnu_name_system_service_ports.h
@@ -0,0 +1,104 @@
+/*
+     This file is part of GNUnet
+     Copyright (C) 2012-2023 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+#ifndef GNUNET_GNS_SERVICE_PORTS_H
+#define GNUNET_GNS_SERVICE_PORTS_H
+
+/**
+ * WARNING:
+ * This header is generated!
+ * In order to add GNS service ports, you must register
+ * them in GANA, and then use the header generation script
+ * to create an update of this file. You may then replace this
+ * file with the update.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+struct GNUNET_GNS_ServicePort
+{
+  const char *name;
+
+  uint16_t port;
+};
+
+struct GNUNET_GNS_ServicePort GNUNET_GNS_ServicePorts[] = {
+  /**
+   * LIGHTest trust policy scheme
+   */
+  {
+    .name = "scheme",
+    .port = 49152
+  },
+
+  /**
+   * LIGHTest trust policy trustlist
+   */
+  {
+    .name = "trustlist",
+    .port = 49153
+  },
+
+  {
+    .name = NULL,
+    .port = 0
+  }
+};
+
+uint16_t
+GNUNET_GNS_service_port_name_to_number (const char *name)
+{
+  int i = 0;
+  while (NULL != GNUNET_GNS_ServicePorts[i].name)
+  {
+    if (0 == strcmp (name, GNUNET_GNS_ServicePorts[i].name))
+      return GNUNET_GNS_ServicePorts[i].port;
+    i++;
+  }
+  return 0;
+}
+
+
+const char*
+GNUNET_GNS_service_port_number_to_name (uint16_t port)
+{
+  int i = 0;
+  while (NULL != GNUNET_GNS_ServicePorts[i].name)
+  {
+    if (port == GNUNET_GNS_ServicePorts[i].port)
+      return GNUNET_GNS_ServicePorts[i].name;
+    i++;
+  }
+  return NULL;
+}
+
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/lib/util/dnsparser.c b/src/lib/util/dnsparser.c
index 5dc6dcf5b..1f51eacdc 100644
--- a/src/lib/util/dnsparser.c
+++ b/src/lib/util/dnsparser.c
@@ -552,9 +552,11 @@ GNUNET_DNSPARSER_parse_uri (const char *udp_payload,
   uri = GNUNET_new (struct GNUNET_DNSPARSER_UriRecord);
   uri->priority = ntohs (uri_bin.prio);
   uri->weight = ntohs (uri_bin.weight);
-  int len =  GNUNET_asprintf(&(uri->target), "%.*s", udp_payload_length - 
sizeof(struct GNUNET_TUN_DnsUriRecord), &udp_payload[*off]);
+  int len =  GNUNET_asprintf (&(uri->target), "%.*s", udp_payload_length
+                              - sizeof(struct GNUNET_TUN_DnsUriRecord),
+                              &udp_payload[*off]);
   (*off) += len;
-  if (NULL == uri->target) // || GNUNET_STRINGS_parse_uri(uri->target, NULL, 
NULL) == GNUNET_NO)
+  if (NULL == uri->target)
   {
     GNUNET_DNSPARSER_free_uri (uri);
     *off = old_off;
@@ -1258,9 +1260,11 @@ GNUNET_DNSPARSER_builder_add_uri (char *dst,
   sd.weight = htons (uri->weight);
   GNUNET_memcpy (&dst[*off], &sd, sizeof(sd));
   (*off) += sizeof(sd);
-  strncpy(&dst[*off], uri->target, dst_len - sizeof(struct 
GNUNET_TUN_DnsUriRecord) - 1);
-  (*off) += strlen(uri->target);
-  dst[*off++] = '\0'; 
+  strncpy (&dst[*off], uri->target, dst_len - sizeof(struct
+                                                     GNUNET_TUN_DnsUriRecord)
+           - 1);
+  (*off) += strlen (uri->target);
+  dst[*off] = '\0';
   return GNUNET_OK;
 }
 
diff --git a/src/plugin/gnsrecord/plugin_gnsrecord_dns.c 
b/src/plugin/gnsrecord/plugin_gnsrecord_dns.c
index dde5ddcea..94b2686a1 100644
--- a/src/plugin/gnsrecord/plugin_gnsrecord_dns.c
+++ b/src/plugin/gnsrecord/plugin_gnsrecord_dns.c
@@ -207,7 +207,7 @@ dns_value_to_string (void *cls,
       GNUNET_DNSPARSER_free_srv (srv);
       return result;
     }
-  
+
   case GNUNET_DNSPARSER_TYPE_URI: {   // RFC7553
       struct GNUNET_DNSPARSER_UriRecord *uri;
       size_t off;
@@ -228,7 +228,7 @@ dns_value_to_string (void *cls,
                        uri->target);
       GNUNET_DNSPARSER_free_uri (uri);
       return result;
-  }
+    }
 
   case GNUNET_DNSPARSER_TYPE_SMIMEA:
   case GNUNET_DNSPARSER_TYPE_TLSA: {
@@ -652,19 +652,19 @@ dns_string_to_value (void *cls,
 
   case GNUNET_DNSPARSER_TYPE_URI: {
       struct GNUNET_DNSPARSER_UriRecord uri;
-      char target[strlen(s)];
+      char target[strlen (s)];
       unsigned int priority;
       unsigned int weight;
       size_t off;
 
-      if (3 != sscanf (s, "%u %u \"%s", &priority, &weight, &target)) // only 
\" bevor %s becuse %s will consume the ending " of the presentation of the URI 
record
+      if (3 != sscanf (s, "%u %u \"%s", &priority, &weight, &target[0])) // 
only \" befor %s because %s will consume the ending " of the presentation of 
the URI record
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     _ ("Unable to parse URI record `%s'\n"),
                     s);
         return GNUNET_SYSERR;
       }
-      target[strlen(target)-1] = '\0'; // Removing the last " of the 
presentation of the URI record
+      target[strlen (target) - 1] = '\0'; // Removing the last " of the 
presentation of the URI record
 
       uri.priority = (uint16_t) priority;
       uri.weight = (uint16_t) weight;
@@ -672,7 +672,9 @@ dns_string_to_value (void *cls,
       off = 0;
 
       // TODO add more precise uri checking (RFC3986)
-      if (strstr(target, &":") == NULL || target[0] == 58 || 
target[strlen(target)-1] == 58)
+      if (strstr (target, ":") == NULL ||
+          target[0] == 58 ||
+          target[strlen (target) - 1] == 58)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     _ ("Failed to serialize URI record with target `%s'\n"),
@@ -680,7 +682,7 @@ dns_string_to_value (void *cls,
         return GNUNET_SYSERR;
       }
 
-      char uribuf[sizeof(struct GNUNET_TUN_DnsUriRecord) + strlen(target) + 
1]; 
+      char uribuf[sizeof(struct GNUNET_TUN_DnsUriRecord) + strlen (target) + 
1];
 
       if (GNUNET_OK !=
           GNUNET_DNSPARSER_builder_add_uri (uribuf, sizeof(uribuf), &off, 
&uri))
@@ -850,6 +852,7 @@ dns_is_critical (void *cls, uint32_t type)
   return GNUNET_NO;
 }
 
+
 /**
  * Entry point for the plugin.
  *
diff --git a/src/service/gns/gnunet-service-gns_resolver.c 
b/src/service/gns/gnunet-service-gns_resolver.c
index d9cdbd60e..445ae3346 100644
--- a/src/service/gns/gnunet-service-gns_resolver.c
+++ b/src/service/gns/gnunet-service-gns_resolver.c
@@ -49,6 +49,8 @@
 #include "gns.h"
 #include "gnunet-service-gns.h"
 #include "gnunet-service-gns_resolver.h"
+#include "gnu_name_system_protocols.h"
+#include "gnu_name_system_service_ports.h"
 
 
 /**
@@ -584,17 +586,15 @@ timeout_resolution (void *cls)
  *
  * @param name name of the protocol
 */
-static struct protoent *
+static int
 resolver_getprotobyname (const char *name)
 {
   struct protoent *pe = getprotobyname (name);
-  if (pe == NULL && strcmp (name, "trust") == 0)
+  if (pe == NULL)
   {
-    pe = GNUNET_new (struct protoent);
-    pe->p_name = "trust";
-    pe->p_proto = 242;
+    return GNUNET_GNS_protocol_name_to_number (name);
   }
-  return pe;
+  return pe->p_proto;
 }
 
 
@@ -604,26 +604,15 @@ resolver_getprotobyname (const char *name)
  * @param name name of the service
  * @param proto name of the protocol
 */
-static struct servent *
+static int
 resolver_getservbyname (const char *name, const char *proto)
 {
   struct servent *se = getservbyname (name, proto);
-  if (se == NULL && strcmp (proto, "trust") == 0)
+  if (se == NULL)
   {
-    if (strcmp (name, "trustlist") == 0)
-    {
-      se = GNUNET_new (struct servent);
-      se->s_name = "trustlist";
-      se->s_port = htons (1002);
-    }
-    else if (strcmp (name, "scheme") == 0)
-    {
-      se = GNUNET_new (struct servent);
-      se->s_name = "scheme";
-      se->s_port = htons (1003);
-    }
+    return htons (GNUNET_GNS_service_port_name_to_number (name));
   }
-  return se;
+  return se->s_port;
 }
 
 
@@ -653,8 +642,8 @@ resolver_lookup_get_next_label (struct GNS_ResolverHandle 
*rh)
   char *ret;
   char *srv_name;
   char *proto_name;
-  struct protoent *pe;
-  struct servent *se;
+  int protocol;
+  int service;
 
   if (0 == rh->name_resolution_pos)
     return NULL;
@@ -710,8 +699,8 @@ resolver_lookup_get_next_label (struct GNS_ResolverHandle 
*rh)
                                  rh->name_resolution_pos - (dot - rh->name)
                                  - 2);
     rh->name_resolution_pos = 0;
-    pe = resolver_getprotobyname (proto_name);
-    if (NULL == pe)
+    protocol = resolver_getprotobyname (proto_name);
+    if (0 == protocol)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   _ ("Protocol `%s' unknown, skipping labels.\n"),
@@ -720,9 +709,9 @@ resolver_lookup_get_next_label (struct GNS_ResolverHandle 
*rh)
       GNUNET_free (srv_name);
       return ret;
     }
-    se = resolver_getservbyname (srv_name,
-                                 proto_name);
-    if (NULL == se)
+    service = resolver_getservbyname (srv_name,
+                                      proto_name);
+    if (0 == service)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   _ (
@@ -741,9 +730,9 @@ resolver_lookup_get_next_label (struct GNS_ResolverHandle 
*rh)
     }
     else
     {
-      rh->service = ntohs (se->s_port);
+      rh->service = ntohs (service);
     }
-    rh->protocol = pe->p_proto;
+    rh->protocol = protocol;
     GNUNET_free (proto_name);
     GNUNET_free (srv_name);
   }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]