Don't include netutl.h.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 36de405..36e10c4 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: protocol.c,v 1.28.4.118 2001/11/03 21:22:02 guus Exp $
+    $Id: protocol.c,v 1.28.4.121 2001/11/16 17:39:59 zarq Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -50,7 +50,6 @@
 
 #include "conf.h"
 #include "net.h"
 
 #include "conf.h"
 #include "net.h"

-#include "netutl.h"

 #include "protocol.h"
 #include "meta.h"
 #include "connection.h"
 #include "protocol.h"
 #include "meta.h"
 #include "connection.h"


@@ -531,7 +530,6 @@ cp
 
 int ack_h(connection_t *c)
 {
 
 int ack_h(connection_t *c)
 {

-  port_t port;

   int weight;
   node_t *n;
   subnet_t *s;
   int weight;
   node_t *n;
   subnet_t *s;


@@ -729,7 +727,7 @@ cp
 
   owner = lookup_node(name);
 
 
   owner = lookup_node(name);
 

-  if(!node)
+  if(!owner)

     {
       syslog(LOG_ERR, _("Got ADD_SUBNET from %s (%s) for %s which is not in our connection list"),
              c->name, c->hostname, name);
     {
       syslog(LOG_ERR, _("Got ADD_SUBNET from %s (%s) for %s which is not in our connection list"),
              c->name, c->hostname, name);


@@ -1126,7 +1124,7 @@ cp
   if(!from)
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
   if(!from)
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));

-      return -1;
+      return 0;

     }
 
   to = lookup_node(to_name);
     }
 
   to = lookup_node(to_name);


@@ -1134,7 +1132,7 @@ cp
   if(!to)
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
   if(!to)
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));

-      return -1;
+      return 0;

     }
 
   /* Check if edge exists */
     }
 
   /* Check if edge exists */


@@ -1152,7 +1150,7 @@ cp
   else
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown edge"));
   else
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown edge"));

-      return -1;
+      return 0;

     }
 
   /* Tell the rest about the deleted edge */
     }
 
   /* Tell the rest about the deleted edge */