Removed another local definition of the variable "errno"

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 0b3563e..d09bd7a 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.
 
-    $Id: protocol.c,v 1.28.4.75 2001/01/07 20:19:31 guus Exp $
+    $Id: protocol.c,v 1.28.4.78 2001/02/06 10:42:27 guus Exp $
 */
 
 #include "config.h"
@@ -1043,20 +1043,20 @@ cp
   return 0;
 }
 
-int send_error(connection_t *cl, int errno, char *errstring)
+int send_error(connection_t *cl, int err, char *errstring)
 {
 cp
   if(!errstring)
-    errstring = strerror(errno);
-  return send_request(cl, "%d %d %s", ERROR, errno, errstring);
+    errstring = strerror(err);
+  return send_request(cl, "%d %d %s", ERROR, err, errstring);
 }
 
 int error_h(connection_t *cl)
 {
-  int errno;
+  int err;
   char errorstring[MAX_STRING_SIZE];
 cp
-  if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &errno, errorstring) != 2)
+  if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
     {
        syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"),
               cl->name, cl->hostname);
@@ -1066,7 +1066,7 @@ cp
   if(debug_lvl >= DEBUG_ERROR)
     {
       syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
-             cl->name, cl->hostname, strerror(errno), errorstring);
+             cl->name, cl->hostname, strerror(err), errorstring);
     }
 
   terminate_connection(cl);
@@ -1128,7 +1128,7 @@ cp
     {
       p = (connection_t *)node->data;
       if(p != cl && p->status.meta && p->status.active)
-        if(!(cl->options & OPTION_INDIRECT) || from == myself)
+        if(!(p->options & OPTION_INDIRECT) || from == myself)
           send_request(p, "%d %s", KEY_CHANGED, from->name);
     }
 cp