- use one tunnelnotification struct

3 files changed, 15 insertions, 15 deletions

diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index 936b81ca7..38e1a9dd7 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -1036,10 +1036,10 @@ send_client_tunnel_create (struct MeshTunnel *t)
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
   msg.tunnel_id = htonl (t->local_tid_dest);
   msg.port = htonl (t->port);
-  msg.options = 0;
-  msg.options |= GNUNET_YES == t->reliable ? GNUNET_MESH_OPTION_RELIABLE : 0;
-  msg.options |= GNUNET_YES == t->nobuffer ? GNUNET_MESH_OPTION_NOBUFFER : 0;
-  msg.options = htonl (msg.options);
+  msg.opt = 0;
+  msg.opt |= GNUNET_YES == t->reliable ? GNUNET_MESH_OPTION_RELIABLE : 0;
+  msg.opt |= GNUNET_YES == t->nobuffer ? GNUNET_MESH_OPTION_NOBUFFER : 0;
+  msg.opt = htonl (msg.opt);
   GNUNET_PEER_resolve (t->id.oid, &msg.peer);
   GNUNET_SERVER_notification_context_unicast (nc, t->client->handle,
                                               &msg.header, GNUNET_NO);
@@ -4836,7 +4836,7 @@ handle_local_tunnel_create (void *cls, struct GNUNET_SERVER_Client *client,
     return;
   }
   t->port = ntohl (t_msg->port);
-  tunnel_set_options (t, ntohl (t_msg->options));
+  tunnel_set_options (t, ntohl (t_msg->opt));
   if (GNUNET_YES == t->reliable)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "!!! Reliable\n");
diff --git a/src/mesh/mesh.h b/src/mesh/mesh.h
index 0443a9e0b..73bc04d27 100644
--- a/src/mesh/mesh.h
+++ b/src/mesh/mesh.h
@@ -174,7 +174,7 @@ struct GNUNET_MESH_TunnelMessage
     /**
      * Options.
      */
-  uint32_t options GNUNET_PACKED;
+  uint32_t opt GNUNET_PACKED;
 };
 
 
diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c
index 9085a7799..186961e6c 100644
--- a/src/mesh/mesh_api.c
+++ b/src/mesh/mesh_api.c
@@ -736,7 +736,7 @@ do_reconnect (struct GNUNET_MESH_Handle *h)
     if (GNUNET_YES == t->reliable)
       options |= GNUNET_MESH_OPTION_RELIABLE;
 
-    tmsg.options = htonl (options);
+    tmsg.opt = htonl (options);
     send_packet (h, &tmsg.header, t);
   }
   return GNUNET_YES;
@@ -791,7 +791,7 @@ reconnect (struct GNUNET_MESH_Handle *h)
  */
 static void
 process_tunnel_created (struct GNUNET_MESH_Handle *h,
-                        const struct GNUNET_MESH_TunnelNotification *msg)
+                        const struct GNUNET_MESH_TunnelMessage *msg)
 {
   struct GNUNET_MESH_Tunnel *t;
   MESH_TunnelNumber tid;
@@ -834,7 +834,7 @@ process_tunnel_created (struct GNUNET_MESH_Handle *h,
     d_msg.tunnel_id = msg->tunnel_id;
     memset (&d_msg.peer, 0, sizeof (struct GNUNET_PeerIdentity));
     d_msg.port = 0;
-    d_msg.options = 0;
+    d_msg.opt = 0;
 
     send_packet (h, &d_msg.header, NULL);
   }
@@ -1076,7 +1076,7 @@ msg_received (void *cls, const struct GNUNET_MessageHeader *msg)
   {
     /* Notify of a new incoming tunnel */
   case GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE:
-    process_tunnel_created (h, (struct GNUNET_MESH_TunnelNotification *) msg);
+    process_tunnel_created (h, (struct GNUNET_MESH_TunnelMessage *) msg);
     break;
     /* Notify of a tunnel disconnection */
   case GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY:
@@ -1426,12 +1426,12 @@ GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h,
   msg.tunnel_id = htonl (t->tid);
   msg.port = htonl (port);
   msg.peer = *peer;
-  msg.options = 0;
+  msg.opt = 0;
   if (GNUNET_YES == reliable)
-    msg.options |= GNUNET_MESH_OPTION_RELIABLE;
+    msg.opt |= GNUNET_MESH_OPTION_RELIABLE;
   if (GNUNET_NO == buffer)
-    msg.options |= GNUNET_MESH_OPTION_NOBUFFER;
-  msg.options = htonl (msg.options);
+    msg.opt |= GNUNET_MESH_OPTION_NOBUFFER;
+  msg.opt = htonl (msg.opt);
   t->allow_send = 0;
   send_packet (h, &msg.header, t);
   return t;
@@ -1453,7 +1453,7 @@ GNUNET_MESH_tunnel_destroy (struct GNUNET_MESH_Tunnel *tunnel)
   msg.tunnel_id = htonl (tunnel->tid);
   memset (&msg.peer, 0, sizeof (struct GNUNET_PeerIdentity));
   msg.port = 0;
-  msg.options = 0;
+  msg.opt = 0;
   th = h->th_head;
   while (th != NULL)
   {