thr3ads.net - tinc - patch for tinc-0.3 [Oct 1999]

If this information is useful, please help other people find it:
Share via:

Hans Bayle

1999-Oct-20 12:37 UTC

patch for tinc-0.3

Hi tinc list members,

There were some problems with Ivo's email adresses (both zarq@iname.com
and 
zarq@spark.icicle.dhs.org) so I resent the stuff to the mailling list.


============================================
                    

Hi Ivo,

Hier is een oplossing voor een bugje in flush_queue(), en ook wat andere
troepjes
zoals een tincd scheduler. Dit werkt wat beter, omdat de scheduler een
afzonderlijk
programma is, en niet meecrashed als tincd down gaat.

Heb alleen nog wel het gevoel dat de ping test in het tincsched soms wat
al te
snel denkt dat er geen verbinding is, ik ga er nog es verder naar
kijken.

Volgens raakt de queue corrupt, omdat bij flush_queue() de rq->tail
pointer
niet goed wordt gezet na afloop.

Ik check in xrec() voor het crypten of het packet misschien corrupt is
door te kijken
of de grootte van het packet klopt - een slecht soort checksun.
Als het niet klopt, wat doe je in zo'n geval, het packet droppen? Want
nu blijft het in de queue zitten.

Greetingz -- hansb
-------------- next part --------------
Only in tinc-0.3-patched: Makefile
Only in tinc-0.3-patched/cipher: Makefile
Only in tinc-0.3-patched/cipher/blowfish: Makefile
diff -r tinc-0.3/cipher/blowfish/bf_cfb64.c
tinc-0.3-patched/cipher/blowfish/bf_cfb64.c
60a61> #include <syslog.h>
75a77> diff -r tinc-0.3/cipher/cipher.c tinc-0.3-patched/cipher/cipher.c
19a20,21> #include <stdio.h>
> 
32a35,36> void fdump(FILE *, char *, int);
> 46c50,53
< 
--->   if (debug_lvl > 3) {
>     syslog(LOG_ERR, "about to blowfish_cfb64");
>     syslog(LOG_ERR, "length in packet: %ld", len);
>   }
47a55,57>   if (debug_lvl > 3) {
>     syslog(LOG_ERR, "done blowfish_cfb64");
>   }
54a65,68>   if (debug_lvl > 10) {
> fdump(stdout, in, in->len);   
>   }
> 
76a91,92> 
> 
107a124,151> 
> /*
>  *      fdump.c -- Dump memory in debug format.
>  *
>  *      Compile separately and link to program,
>  *      or just include this file.
>  *
>  */
> void fdump(FILE *stream, char *adr,int bytecount)
> {
>         int i,j, linecount;
>         char asc_str[17];
>         unsigned char c;
>         linecount = (bytecount + 15) / 16;
>         asc_str[16] = '\0';
>         for(j=0; j<linecount; j++) {
>             fprintf(stream, "\n%06d ", adr+16*j);
>             for(i=0; i<16; i++) {
>                 c = *(adr+16*j+i);
>                 asc_str[i] = (c >= 32 && c < 128) ? c :
'.';
>                 fprintf(stream, "%c%02X", (i==8) ? '-' :
' ', (int) c);
>             }
>             fprintf(stream, "    %s", asc_str);
>         }
>         fprintf(stream, "\n");
> }
> /* end of fdump.c */
> Only in tinc-0.3-patched/cipher/idea: Makefile
Only in tinc-0.3-patched: config.cache
Only in tinc-0.3-patched: config.h
Only in tinc-0.3-patched: config.log
Only in tinc-0.3-patched: config.status
Only in tinc-0.3-patched/doc: Makefile
diff -r tinc-0.3/doc/tincd.8 tinc-0.3-patched/doc/tincd.8
2c2
< .TH TINC 1 "August 1999" "tinc version 0.3"
"FSF"
---> .TH TINC 1 "October 1999" "tinc version 0.3"
"FSF"Only in tinc-0.3-patched/lib: Makefile
Only in tinc-0.3-patched: libtool
Only in tinc-0.3-patched/m4: Makefile
Only in tinc-0.3-patched: misc
Only in tinc-0.3-patched/src: Makefile
Only in tinc-0.3-patched/src: bla
diff -r tinc-0.3/src/net.c tinc-0.3-patched/src/net.c
129a130,132> /*
>  * decrypt received udp packet, and write into tap device
>  */
132a136>   real_packet_t *rp_ptr;
133a138,146>   int rp_lenin;
> 
>   rp_lenin = ((real_packet_t *) packet)->data.len;
> 
>   /* encryption will crash when packet has unexpected len */
>   if ( ! ((rp_lenin > 20) && (rp_lenin < MAXSIZE))) {
>     syslog(LOG_ERR, "dropping strange packet len: %d", rp_lenin);
>     return 1;
>   } 140c153
<   else
--->   else {
141a155,156>     if(debug_lvl > 3) syslog(LOG_DEBUG, "writing in tap - %d -
%d", vp.len + 2, lenin);
>   }154,155c169,178
<   if(debug_lvl > 3)
<     syslog(LOG_DEBUG, "packet to queue: %d", s);
--->   if(debug_lvl > 3) {
>     syslog(LOG_DEBUG, "packet to queue: %d", s - 2);
> dump_pkt_queue(*q);
>     if (*q) {
>   if((*q)->head)
>     syslog(LOG_DEBUG, "head != NULL");
>   if((*q)->tail)
>     syslog(LOG_DEBUG, "tail != NULL");
>     }
>    }
159a183> 
167a192> 
171a197> 
183a210,211>   int i=0;
>   real_packet_t *vp;
185a214,217>   if(debug_lvl > 3) {
>   dump_conn_list();
>   }
> 
187a220,223>       i++;
>       vp = (real_packet_t *) p->packet;
>       if(debug_lvl > 1) syslog(LOG_DEBUG, "flushing packet %d len:
%d", i, vp->len);
> 190d225
< cp
192c227
<         {
--->         { /* returned zero: remove packet and queue elem */198c233,234
< cp
--->           if(debug_lvl > 1) syslog(LOG_DEBUG, "freeing packet %d
", i);
> 200d235
< cp
202d236
< cp
204a239>         {206c241
< cp
--->         }
209a245,252>   
>   /* adjust to last element left in queue */
>   if (prev)
>       pq->tail = prev;
>   else {
>       pq->tail = NULL;
>       pq->head = NULL;
>   }222d264
< cp
228a271,272>       if(debug_lvl > 1)
> dump_pkt_queue(cl->sq);230d273
< cp
237a281,282>       if(debug_lvl > 1)
> dump_pkt_queue(cl->rq);239d283
< cp
267a312,313>       if(debug_lvl > 1)
> dump_pkt_queue(cl->sq);
268a315,316>       if(debug_lvl > 1)
> dump_pkt_queue(cl->sq);
276a325,326>       if(debug_lvl > 1)
> dump_pkt_queue(cl->sq);
278a329,330> dump_pkt_queue(cl->sq);
>       if(debug_lvl > 1)
768a821> dump_pkt_queue(f->rq);
769a823> dump_pkt_queue(f->rq);Only in tinc-0.3-patched/src: net.c.org
diff -r tinc-0.3/src/netutl.c tinc-0.3-patched/src/netutl.c
219a220,238> void dump_pkt_queue(packet_queue_t *pq)
> {
>   int i=0;
>   real_packet_t *vp;
>   queue_element_t *p, *q;
> 
>   if(debug_lvl > 1) syslog(LOG_DEBUG, "dumping queue");
> 
>   if (!pq) return;
> 
>   for(p = pq->head; p != NULL; p = q)
>     {
>       i++;
>       vp = (real_packet_t *) p->packet;
>       if(debug_lvl > 1) syslog(LOG_DEBUG, "queue has packet %d len:
%d", i, vp->len);
>       q = p->next;
>     }
> }
> diff -r tinc-0.3/src/netutl.h tinc-0.3-patched/src/netutl.h
33a34> extern void dump_pkt_queue(packet_queue_t *);diff -r tinc-0.3/src/tincd.c tinc-0.3-patched/src/tincd.c
429a430,431> /* looping sigsegv handler: want a core dump */
> /*
431a434> */Only in tinc-0.3-patched: stamp-h


-------------- next part --------------
#!/usr/bin/perl
#
#
# program that schedules tincd
#
# watches if it is up
# watches if there is a connection

use POSIX;
require 'timelocal.pl';
use Sys::Syslog  qw(:DEFAULT setlogsock);
use Sys::Hostname;
use Net::Ping;

$HOME="/usr/local/etc/tinc";
$LOGDIR="/var/log";
$PROGNAME="tincsched";
$TESTHOST="a2000-gw1.aie.nl";

$host = $TESTHOST;
$oldmsg = "";
$0 = $PROGNAME; # cant get `ps -ef` show my progname ):

&check_pid("$HOME/tincsched.pid", $$);

&redir_io_log($PROGNAME);

write_syslog('info', "$PROGNAME started with pid $$ \n");

$SIG{'CHLD'} = 'handler';
$SIG{'TERM'} = 'sigtermhandler';
chdir("$HOME") || die "Can't chdir to $HOME";

$p = Net::Ping->new("icmp");


# endless loop
while (1) { 
    #
    # check if in the process table
    $result = `ps auwx | grep tincd | grep -v grep`;
    if (!$result) {
	write_syslog('info', "$PROGNAME: tincd not running, restarting
tincd \n");
        $cmd = "/etc/rc.d/init.d/tinc starttinc";
        system($cmd);
	sleep 30; # 15 secs
    }

    # check if there is a connection
    if (!$p->ping($host, 30)) {
	write_syslog('info', "$PROGNAME: connection loss, stopping tincd
\n");
        $cmd = "/etc/rc.d/init.d/tinc stoptinc";
        system($cmd);
	sleep 3; # 15 secs
	write_syslog('info', "$PROGNAME: connection loss, restarting tincd
\n");
        $cmd = "/etc/rc.d/init.d/tinc starttinc";
        system($cmd);
	sleep 30; # 15 secs
    }

    sleep 30; # 15 secs
}

close(OUT);

exit 0;


sub redir_io_log {
    local($name) = @_;
    # do not buffer io
    select((select(STDOUT), $| = 1)[0]);
    select((select(STDERR), $| = 1)[0]);

    # redirect stdout and stderr
    open(STDOUT, ">>$LOGDIR/tinc.log");
    open(STDERR, ">&STDOUT");
}


sub print_log {
    ($tsec,$tmin,$thour,$mday, $mon,$year,$rest) = localtime(time());

    $monno = $mon + 1;
    if ($monno<10) {
	$monno = "0$monno";
    }
    if ($mday<10) {
	$mday = "0$mday";
    }
    if ($year > 99) {
	$yearno = "20" . $year;
    } else {
	$yearno = "19" . $year;
    }

    $time = sprintf("%2.2d-%2.2d-%2.2d
%2.2d:%2.2d:%2.2d",$year,$monno,$mday,
	$thour, $tmin, $tsec);
    print("$time $$ @_");
}


sub write_syslog {
    local($pri, $message) = @_;
   
    setlogsock ('unix');
#print "write_syslog(local): pri: <$pri> message:
<$message>\n";

    # progname, logto console if not succeed / write the pid, facility
#print "write_syslog(openlog): PROGNAME: <$PROGNAME>\n";
    openlog($PROGNAME, 'cons, pid, nowait', 'daemon');

    # priority, message strings
#print "write_syslog(syslog): pri: <$pri> message:
<$message>\n";
    syslog($pri, $message);

    # close the log
    closelog();
}



sub write_pid {
    local($file, $pid) = @_;
    open(LOCK, ">$file");
    print LOCK "$pid\n";
    close(LOCK);
}

sub rm_lock {
    local($file, $pid) = @_;
    unlink($file);
}

sub check_pid {
    local($file, $pid) = @_;
    if (-e $file) {
	#uhoh file exists...
	open(LOCK, "<$file");
	$foreignpid = <LOCK>;
	chop($foreignpid);
	close(LOCK);


	#valid pid?
	if ($foreignpid) {

	    print "tincsched: saw an old lockfile with pid $foreignpid\n";
	    write_syslog('info', "tincsched: saw an old lockfile with pid
$foreignpid\n");

	    $fpids = `ps -ef | grep "/usr/bin/perl /dev/fd" | grep -v grep |
/bin/sed -e 's/ *[a-z0-9]*  *//' -e 's/ .*//'`;
	    @the_running_pids = split /\n/, $fpids;

	    $found=0;
	    foreach $rpid (@the_running_pids) {
		if ($foreignpid == $rpid) {
			$found=1;
		}
	    }
	} else {
	    write_pid($file, $pid);
	    return;
	}

	if ($found) {
	    foreach $rpid (@the_running_pids) {
		if ($foreignpid == $rpid) {
			write_syslog('info', "tincsched: tincsched [$rpid] is already
running.\n");
			die("tincsched: tincsched [$rpid] is already running.\n");
		}
	    }
	} else {
	    write_syslog('info', "tincsched: $foreignpid doesn't run,
overwriting lockfile .\n");
	    print "tincsched: $foreignpid doesn't run, overwriting lockfile
.\n";
	    write_pid($file, $pid);
	    return;
	}
    } else {
	write_pid($file, $pid);
	return;
    }
}


sub handler {
    local($sig) = @_;


    $childpid = waitpid(-1, 1);

    if ($children{$childpid}) {
	print "tincsched: Caught a SIG$sig\n";
	write_syslog('info', "Caught a SIG$sig\n");

	print "Child had pid $childpid, $children{$childpid} is ready for
deletion.\n";
	write_syslog('info', "Child had pid $childpid, deleting
$children{$childpid}\n");

	delete $children{$childpid};
    } else {
#	print "tincsched: $childpid not spawned by me.\n";
#	write_syslog('info', "$childpid not spawned by me.\n");
    }
    1;
}


sub sigtermhandler {
    local($sig) = @_;

    print "tincsched: Caught a SIG$sig\n";
    write_syslog('info', "tincsched: Caught a SIG$sig\n");

    foreach $key (keys %children) {

	print "tincsched: killing child $key\n";
	write_syslog('info', "tincsched: killing child $key\n");

	kill 15, $key;
    }

    print "tincsched: Removing lockfile\n";
    write_syslog('info', "tincsched: Removing lockfile\n");
    
    &rm_lock("$HOME/ipmkbs.pid", $$);

    print "tincsched: terminating\n";
    write_syslog('info', "tincsched: terminating\n");

    exit(0);
    1;
}

sub lock_file {
    local($path) = @_;


    $lock_status = 0;
    #
    # WHOOPS.. open the filehandle NON destructive
    #
    $open_status = open(FDESCRIPTOR, "+>>$path");
    if ($open_status) {

	#
	# now test AND lock if test succeeds
	#
	if (File::lockf::tlock(FDESCRIPTOR) == EAGAIN) {
	    # wait for the next main loop cycle
	    $lock_status = 0;
	    write_syslog('info', "IPMKBS: $qfile $path locked by
sendmail.\n");
	    close(FDESCRIPTOR);
	} else {
	    # got the lock here
	    $lock_status = 1;
	    write_syslog('info', "IPMKBS: $qfile $path locked by
me.\n");
	}
    } else {
	    # hmm.. must be in use
	    write_syslog('info', "IPMKBS: $qfile $path locked by
sendmail?\n");
    }
    return $lock_status;
}



sub unlock_file {
    local($path) = @_;
    if ($lock_status) {
	$open_status = open(FDESCRIPTOR, "+>>$path");
	if ($open_status) {
	    File::lockf::ulock(FDESCRIPTOR);
	    close(FDESCRIPTOR);
	    write_syslog('info', "IPMKBS: $qfile $path unlocked.\n");
	} else {
	    write_syslog('info', "IPMKBS: $qfile WHOOPS Cant get a FH for
$path.\n");
	}
    }
}


-------------- next part --------------
#!/bin/sh
#
#
#
# Source function library
. /etc/rc.d/init.d/functions

# dump core
ulimit -c 10000000

# See how we were called.
case "$1" in
  start)
	echo -n "Starting up tinc system... "
        /bin/rm -f /core
	ifconfig tap0 down
#	ifconfig tap0 hw ether fe:fd:c0:a8:0a:02
	ifconfig tap0 hw ether fe:fd:c0:a8:0a:02
	ifconfig tap0 up
#	route add  -net 193.78.1.0/24 gw 193.78.1.82
	route add  -host 193.78.1.4 gw 193.78.1.82
	route add  -host 193.78.1.9 gw 193.78.1.82
	route add  -host 193.78.1.15 gw 193.78.1.82
	route add  -host 193.78.1.18 gw 193.78.1.82
	/usr/local/sbin/tincd -n fui-vpn
#	/usr/local/sbin/tincd -d -d -d -d -d -d -n fui-vpn
        /usr/local/sbin/tincsched &
	touch /var/lock/subsys/tinc
	echo done
	;;
  starttinc)
	echo -n "Starting up tinc only... "
        /bin/rm -f /core
#	route add  -net 193.78.1.0/24 gw 193.78.1.82
	route add  -host 193.78.1.4 gw 193.78.1.82
	route add  -host 193.78.1.9 gw 193.78.1.82
	route add  -host 193.78.1.18 gw 193.78.1.82
	route add  -host 193.78.1.15 gw 193.78.1.82
	/usr/local/sbin/tincd -n fui-vpn
#	/usr/local/sbin/tincd -d -d -d -d -d -d -n fui-vpn
	touch /var/lock/subsys/tinco
	echo done
	;;
  stoptinc)
	echo -n "Shutting down tinc only..."
	/usr/local/sbin/tincd -k -n fui-vpn
	rm -f /var/log/subsys/tinco
	echo
	;;
  stop)
	echo -n "Shutting down all tinc..."
        killall tincsched
	route del  -host 193.78.1.9 gw 193.78.1.82
	route del  -host 193.78.1.18 gw 193.78.1.82
	route del  -host 193.78.1.15 gw 193.78.1.82
	/usr/local/sbin/tincd -k -n fui-vpn
	ifconfig tap0 down
	rm -f /var/log/subsys/tinc
	echo
	;;
  status)
	status tinc
	;;
  restart|reload)
	$0 stop
	$0 start
	;;
esac

exit 0

Ivo Timmermans

1999-Oct-20 22:37 UTC

head link

patch for tinc-0.3

Hi Hans,

I will put your script to keep tincd alive in a contrib directory on
the ftp server. It seems like a nice thingy to have.

Further, i rewrote add_queue() so that it doesn't use the prev
element, and the first tests show that this actually makes tinc
reliably stable... thanks very much for debugging!

About your suggestions w.r.t. the queue, I think it's not fair to have
the `stable' tinc check for packet lengths, it should work without
doing it. It may be a good idea to have this in the development tree
though.

I will prepare a 0.3.1, which will be available sometime soon. This
version will have all bugfixes since 0.3, no new features.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 232 bytes
Desc: not available
Url :
http://brouwer.uvt.nl/pipermail/tinc/attachments/19991020/5532a21f/attachment.pgp

Hans Bayle

1999-Oct-25 20:21 UTC

head link

patch for tinc-0.3

(sorry for using this list, but I cannot reach zarq directly)


Ivo,

Ik zal dat je 0.3.1 al officieel hebt gemaakt. Ik heb een diff -ur
gestuurd, maar
ik kreeg weer gebouncde mail. Zou je nogeens naar flush_queue() kunnen
kijken. Bij
mij loste de patch in flush_queue() het probleem op.

A message that you sent could not be delivered to all of its recipients.
The
following address(es) failed:

  zarq@iname.com:
    SMTP error from remote mailer after RCPT TO:
    <zarq@iname.com>:
    host mail-intake-1.iname.net [165.251.8.94]:
    523 <zarq@iname.com>... The IP address 62.108.1.19 is blacklisted.
contact your administrator for details.

------ This is a copy of the message, including all the headers. ------


Ivo Timmermans wrote:
>
>
> Dan nog een vraagje.. zou je een diff -ur willen sturen? Dat is voor
> mij een stuk leesbaarder. bvd.
>
Ivo,

Hierbij de diff -ur
Het gaat vooral om flush_queue()
Staat hier in de body en als attachment.

Groeten -- hansb


Only in tinc-0.3-patched: Makefile
Only in tinc-0.3-patched/cipher: Makefile
Only in tinc-0.3-patched/cipher/blowfish: Makefile
diff -ur tinc-0.3/cipher/blowfish/bf_cfb64.c
tinc-0.3-patched/cipher/blowfish/bf_cfb64.c
--- tinc-0.3/cipher/blowfish/bf_cfb64.c Thu Jan 23 08:44:52 1997
+++ tinc-0.3-patched/cipher/blowfish/bf_cfb64.c Sun Oct 17 02:39:21 1999
@@ -58,6 +58,7 @@

 #include "blowfish.h"
 #include "bf_locl.h"
+#include <syslog.h>

 /* The input and output encrypted as though 64bit cfb mode is being
  * used.  The extra state information to record how much of the
@@ -73,6 +74,7 @@
 int *num;
 int encrypt;
  {
+
  register BF_LONG v0,v1,t;
  register int n= *num;
  register long l=length;
diff -ur tinc-0.3/cipher/cipher.c tinc-0.3-patched/cipher/cipher.c
--- tinc-0.3/cipher/cipher.c Fri Aug 20 00:53:46 1999
+++ tinc-0.3-patched/cipher/cipher.c Sun Oct 17 22:13:18 1999
@@ -17,6 +17,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

+#include <stdio.h>
+
 #include "config.h"

 #include <dlfcn.h>
@@ -30,6 +32,8 @@

 #include "net.h"

+void fdump(FILE *, char *, int);
+
 void (*blowfish_cfb64_encrypt) (unsigned char*, unsigned char*, int,
     BF_KEY*, unsigned char*, int*, int) = NULL;
 void (*blowfish_set_key) (BF_KEY*, int, char*) = NULL;
@@ -43,8 +47,14 @@
   unsigned char ivec[8];

   memcpy(ivec, initvec, 8);
-
+  if (debug_lvl > 3) {
+    syslog(LOG_ERR, "about to blowfish_cfb64");
+    syslog(LOG_ERR, "length in packet: %ld", len);
+  }
   blowfish_cfb64_encrypt(in, out, len, k, &ivec[0], &count, c);
+  if (debug_lvl > 3) {
+    syslog(LOG_ERR, "done blowfish_cfb64");
+  }
 }

 void do_encrypt(vpn_packet_t *in, real_packet_t *out, enc_key_t *key)
@@ -52,6 +62,10 @@
   unsigned char ivec[8];
   int r;

+  if (debug_lvl > 10) {
+fdump(stdout, in, in->len);
+  }
+
   memcpy(ivec, initvec, 8);
   cipher_set_key(&encryption_key, key->length, key->key);
   low_crypt_key((char*)(&in->data), (char*)(&out->data.data),
@@ -74,6 +88,8 @@

   memcpy(ivec, initvec, 8);
   cipher_set_key(&encryption_key, key->length, key->key);
+
+
   low_crypt_key((char*)(&in->data.data), (char*)(&out->data),
      &encryption_key, in->data.len, BF_DECRYPT);
   out->len = in->data.len;
@@ -105,3 +121,31 @@

   return 0;
 }
+
+/*
+ *      fdump.c -- Dump memory in debug format.
+ *
+ *      Compile separately and link to program,
+ *      or just include this file.
+ *
+ */
+void fdump(FILE *stream, char *adr,int bytecount)
+{
+        int i,j, linecount;
+        char asc_str[17];
+        unsigned char c;
+        linecount = (bytecount + 15) / 16;
+        asc_str[16] = '\0';
+        for(j=0; j<linecount; j++) {
+            fprintf(stream, "\n%06d ", adr+16*j);
+            for(i=0; i<16; i++) {
+                c = *(adr+16*j+i);
+                asc_str[i] = (c >= 32 && c < 128) ? c :
'.';
+                fprintf(stream, "%c%02X", (i==8) ? '-' :
' ', (int) c);
+            }
+            fprintf(stream, "    %s", asc_str);
+        }
+        fprintf(stream, "\n");
+}
+/* end of fdump.c */
+
Only in tinc-0.3-patched/cipher/idea: Makefile
Only in tinc-0.3-patched: config.cache
Only in tinc-0.3-patched: config.h
Only in tinc-0.3-patched: config.log
Only in tinc-0.3-patched: config.status
Only in tinc-0.3-patched/doc: Makefile
diff -ur tinc-0.3/doc/tincd.8 tinc-0.3-patched/doc/tincd.8
--- tinc-0.3/doc/tincd.8 Thu Aug 19 23:58:08 1999
+++ tinc-0.3-patched/doc/tincd.8 Sat Oct 16 20:51:10 1999
@@ -1,5 +1,5 @@
 ." DO NOT MODIFY THIS FILE!  It was generated by help2man 1.006.
-.TH TINC 1 "August 1999" "tinc version 0.3" "FSF"
+.TH TINC 1 "October 1999" "tinc version 0.3"
"FSF"
 .SH NAME
 tinc \- tinc daemon
 .SH SYNOPSIS
Only in tinc-0.3-patched/lib: Makefile
Only in tinc-0.3-patched: libtool
Only in tinc-0.3-patched/m4: Makefile
Only in tinc-0.3-patched: misc
Only in tinc-0.3-patched/src: Makefile
Only in tinc-0.3-patched/src: bla
diff -ur tinc-0.3/src/net.c tinc-0.3-patched/src/net.c
--- tinc-0.3/src/net.c Fri Aug 20 11:25:06 1999
+++ tinc-0.3-patched/src/net.c Mon Oct 18 22:38:43 1999
@@ -127,18 +127,33 @@
   return done;
 }

+/*
+ * decrypt received udp packet, and write into tap device
+ */
 int xrecv(conn_list_t *cl, void *packet)
 {
   vpn_packet_t vp;
+  real_packet_t *rp_ptr;
   int lenin;
+  int rp_lenin;
+
+  rp_lenin = ((real_packet_t *) packet)->data.len;
+
+  /* encryption will crash when packet has unexpected len */
+  if ( ! ((rp_lenin > 20) && (rp_lenin < MAXSIZE))) {
+    syslog(LOG_ERR, "dropping strange packet len: %d", rp_lenin);
+    return 1;
+  }

   do_decrypt((real_packet_t*)packet, &vp, cl->key);
   add_mac_addresses(&vp);

   if((lenin = write_n(tap_fd, &vp, vp.len + 2)) < 0)
     syslog(LOG_ERR, "Can't write to tap device: %m");
-  else
+  else {
     total_tap_out += lenin;
+    if(debug_lvl > 3) syslog(LOG_DEBUG, "writing in tap - %d -
%d",
vp.len + 2, lenin);
+  }

   return 0;
 }
@@ -151,12 +166,21 @@
 {
   queue_element_t *e;

-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "packet to queue: %d", s);
+  if(debug_lvl > 3) {
+    syslog(LOG_DEBUG, "packet to queue: %d", s - 2);
+dump_pkt_queue(*q);
+    if (*q) {
+  if((*q)->head)
+    syslog(LOG_DEBUG, "head != NULL");
+  if((*q)->tail)
+    syslog(LOG_DEBUG, "tail != NULL");
+    }
+   }

   e = xmalloc(sizeof(queue_element_t));
   e->packet = xmalloc(s);
   memcpy(e->packet, packet, s);
+
   if(!*q)
     {
       *q = xmalloc(sizeof(packet_queue_t));
@@ -165,10 +189,12 @@

   e->prev = (*q)->tail;
   e->next = NULL;
+
   if((*q)->tail)
     (*q)->tail->next = e;

   (*q)->tail = e;
+
   if(!(*q)->head)
     (*q)->head = e;
 }
@@ -181,32 +207,49 @@
 void flush_queue(conn_list_t *cl, packet_queue_t *pq,
    int (*function)(conn_list_t*,void*))
 {
+  int i=0;
+  real_packet_t *vp;
   queue_element_t *p, *prev = NULL, *next = NULL;

+  if(debug_lvl > 3) {
+  dump_conn_list();
+  }
+
   for(p = pq->head; p != NULL; )
     {
+      i++;
+      vp = (real_packet_t *) p->packet;
+      if(debug_lvl > 1) syslog(LOG_DEBUG, "flushing packet %d len:
%d",
i, vp->len);
+
       next = p->next;

-cp
       if(!function(cl, p->packet))
-        {
+        { /* returned zero: remove packet and queue elem */
           if(prev)
             prev->next = next;
           else
             pq->head = next;

-cp
+          if(debug_lvl > 1) syslog(LOG_DEBUG, "freeing packet %d
", i);
+
           free(p->packet);
-cp
    free(p);
-cp
         }
       else
+        {
         prev = p;
-cp
+        }

       p = next;
     }
+
+  /* adjust to last element left in queue */
+  if (prev)
+      pq->tail = prev;
+  else {
+      pq->tail = NULL;
+      pq->head = NULL;
+  }

   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "queue flushed");
@@ -219,15 +262,15 @@
 */
 void flush_queues(conn_list_t *cl)
 {
-cp
   if(cl->sq)
     {
       if(debug_lvl > 1)
  syslog(LOG_DEBUG, "Flushing send queue for " IP_ADDR_S,
         IP_ADDR_V(cl->vpn_ip));
       flush_queue(cl, cl->sq, xsend);
+      if(debug_lvl > 1)
+dump_pkt_queue(cl->sq);
     }
-cp

   if(cl->rq)
     {
@@ -235,8 +278,9 @@
  syslog(LOG_DEBUG, "Flushing receive queue for " IP_ADDR_S,
         IP_ADDR_V(cl->vpn_ip));
       flush_queue(cl, cl->rq, xrecv);
+      if(debug_lvl > 1)
+dump_pkt_queue(cl->rq);
     }
-cp
 }

 /*
@@ -265,7 +309,11 @@

   if(!cl->status.validkey)
     {
+      if(debug_lvl > 1)
+dump_pkt_queue(cl->sq);
       add_queue(&(cl->sq), packet, packet->len + 2);
+      if(debug_lvl > 1)
+dump_pkt_queue(cl->sq);
       if(!cl->status.waitingforkey)
  send_key_request(to);
       return 0;
@@ -274,8 +322,12 @@
 cp
   if(!cl->status.active)
     {
+      if(debug_lvl > 1)
+dump_pkt_queue(cl->sq);
       add_queue(&(cl->sq), packet, packet->len + 2);
       if(debug_lvl > 1)
+dump_pkt_queue(cl->sq);
+      if(debug_lvl > 1)
  syslog(LOG_INFO, IP_ADDR_S " is not ready, queueing packet.",
IP_ADDR_V(cl->vpn_ip));
       return 0; /* We don't want to mess up, do we? */
     }
@@ -766,7 +818,9 @@
  xrecv(f, &rp);
       else
  {
+dump_pkt_queue(f->rq);
    add_queue(&(f->rq), &rp, rp.len);
+dump_pkt_queue(f->rq);
    if(!cl->status.waitingforkey)
      send_key_request(rp.from);
  }
Only in tinc-0.3-patched/src: net.c.org
diff -ur tinc-0.3/src/netutl.c tinc-0.3-patched/src/netutl.c
--- tinc-0.3/src/netutl.c Sun Aug 15 14:01:20 1999
+++ tinc-0.3-patched/src/netutl.c Mon Oct 18 20:18:21 1999
@@ -217,6 +217,25 @@
   return ip;
 }

+void dump_pkt_queue(packet_queue_t *pq)
+{
+  int i=0;
+  real_packet_t *vp;
+  queue_element_t *p, *q;
+
+  if(debug_lvl > 1) syslog(LOG_DEBUG, "dumping queue");
+
+  if (!pq) return;
+
+  for(p = pq->head; p != NULL; p = q)
+    {
+      i++;
+      vp = (real_packet_t *) p->packet;
+      if(debug_lvl > 1) syslog(LOG_DEBUG, "queue has packet %d len:
%d", i, vp->len);
+      q = p->next;
+    }
+}
+
 void dump_conn_list(void)
 {
   conn_list_t *p;
diff -ur tinc-0.3/src/netutl.h tinc-0.3-patched/src/netutl.h
--- tinc-0.3/src/netutl.h Thu Aug 12 19:27:17 1999
+++ tinc-0.3-patched/src/netutl.h Sun Oct 17 00:21:57 1999
@@ -31,5 +31,6 @@
 extern char *hostlookup(unsigned long);
 extern ip_mask_t *strtoip(char*);
 extern void dump_conn_list(void);
+extern void dump_pkt_queue(packet_queue_t *);

 #endif /* __TINC_NETUTL_H__ */
diff -ur tinc-0.3/src/tincd.c tinc-0.3-patched/src/tincd.c
--- tinc-0.3/src/tincd.c Thu Aug 19 18:32:19 1999
+++ tinc-0.3-patched/src/tincd.c Sat Oct 16 20:09:29 1999
@@ -427,8 +427,11 @@
     signal(SIGTERM, sigterm_handler);
   if(signal(SIGQUIT, SIG_IGN) != SIG_ERR)
     signal(SIGQUIT, sigquit_handler);
+/* looping sigsegv handler: want a core dump */
+/*
   if(signal(SIGSEGV, SIG_IGN) != SIG_ERR)
     signal(SIGSEGV, sigsegv_handler);
+*/
   if(signal(SIGHUP, SIG_IGN) != SIG_ERR)
     signal(SIGHUP, sighup_handler);
   signal(SIGPIPE, SIG_IGN);
Only in tinc-0.3-patched: stamp-h
-------------- next part --------------
Only in tinc-0.3-patched: Makefile
Only in tinc-0.3-patched/cipher: Makefile
Only in tinc-0.3-patched/cipher/blowfish: Makefile
diff -ur tinc-0.3/cipher/blowfish/bf_cfb64.c
tinc-0.3-patched/cipher/blowfish/bf_cfb64.c
--- tinc-0.3/cipher/blowfish/bf_cfb64.c	Thu Jan 23 08:44:52 1997
+++ tinc-0.3-patched/cipher/blowfish/bf_cfb64.c	Sun Oct 17 02:39:21 1999
@@ -58,6 +58,7 @@
 
 #include "blowfish.h"
 #include "bf_locl.h"
+#include <syslog.h>
 
 /* The input and output encrypted as though 64bit cfb mode is being
  * used.  The extra state information to record how much of the
@@ -73,6 +74,7 @@
 int *num;
 int encrypt;
 	{
+
 	register BF_LONG v0,v1,t;
 	register int n= *num;
 	register long l=length;
diff -ur tinc-0.3/cipher/cipher.c tinc-0.3-patched/cipher/cipher.c
--- tinc-0.3/cipher/cipher.c	Fri Aug 20 00:53:46 1999
+++ tinc-0.3-patched/cipher/cipher.c	Sun Oct 17 22:13:18 1999
@@ -17,6 +17,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <stdio.h>
+
 #include "config.h"
 
 #include <dlfcn.h>
@@ -30,6 +32,8 @@
 
 #include "net.h"
 
+void fdump(FILE *, char *, int);
+
 void (*blowfish_cfb64_encrypt) (unsigned char*, unsigned char*, int,
 				BF_KEY*, unsigned char*, int*, int) = NULL;
 void (*blowfish_set_key) (BF_KEY*, int, char*) = NULL;
@@ -43,8 +47,14 @@
   unsigned char ivec[8];
 
   memcpy(ivec, initvec, 8);
-
+  if (debug_lvl > 3) {
+    syslog(LOG_ERR, "about to blowfish_cfb64");
+    syslog(LOG_ERR, "length in packet: %ld", len);
+  }
   blowfish_cfb64_encrypt(in, out, len, k, &ivec[0], &count, c);
+  if (debug_lvl > 3) {
+    syslog(LOG_ERR, "done blowfish_cfb64");
+  }
 }
 
 void do_encrypt(vpn_packet_t *in, real_packet_t *out, enc_key_t *key)
@@ -52,6 +62,10 @@
   unsigned char ivec[8];
   int r;
 
+  if (debug_lvl > 10) {
+fdump(stdout, in, in->len);   
+  }
+
   memcpy(ivec, initvec, 8);
   cipher_set_key(&encryption_key, key->length, key->key);
   low_crypt_key((char*)(&in->data), (char*)(&out->data.data),
@@ -74,6 +88,8 @@
 
   memcpy(ivec, initvec, 8);
   cipher_set_key(&encryption_key, key->length, key->key);
+
+
   low_crypt_key((char*)(&in->data.data), (char*)(&out->data),
 		   &encryption_key, in->data.len, BF_DECRYPT);
   out->len = in->data.len;
@@ -105,3 +121,31 @@
 
   return 0;
 }
+
+/*
+ *      fdump.c -- Dump memory in debug format.
+ *
+ *      Compile separately and link to program,
+ *      or just include this file.
+ *
+ */
+void fdump(FILE *stream, char *adr,int bytecount)
+{
+        int i,j, linecount;
+        char asc_str[17];
+        unsigned char c;
+        linecount = (bytecount + 15) / 16;
+        asc_str[16] = '\0';
+        for(j=0; j<linecount; j++) {
+            fprintf(stream, "\n%06d ", adr+16*j);
+            for(i=0; i<16; i++) {
+                c = *(adr+16*j+i);
+                asc_str[i] = (c >= 32 && c < 128) ? c :
'.';
+                fprintf(stream, "%c%02X", (i==8) ? '-' :
' ', (int) c);
+            }
+            fprintf(stream, "    %s", asc_str);
+        }
+        fprintf(stream, "\n");
+}
+/* end of fdump.c */
+
Only in tinc-0.3-patched/cipher/idea: Makefile
Only in tinc-0.3-patched: config.cache
Only in tinc-0.3-patched: config.h
Only in tinc-0.3-patched: config.log
Only in tinc-0.3-patched: config.status
Only in tinc-0.3-patched/doc: Makefile
diff -ur tinc-0.3/doc/tincd.8 tinc-0.3-patched/doc/tincd.8
--- tinc-0.3/doc/tincd.8	Thu Aug 19 23:58:08 1999
+++ tinc-0.3-patched/doc/tincd.8	Sat Oct 16 20:51:10 1999
@@ -1,5 +1,5 @@
 ." DO NOT MODIFY THIS FILE!  It was generated by help2man 1.006.
-.TH TINC 1 "August 1999" "tinc version 0.3" "FSF"
+.TH TINC 1 "October 1999" "tinc version 0.3"
"FSF"
 .SH NAME
 tinc \- tinc daemon
 .SH SYNOPSIS
Only in tinc-0.3-patched/lib: Makefile
Only in tinc-0.3-patched: libtool
Only in tinc-0.3-patched/m4: Makefile
Only in tinc-0.3-patched: misc
Only in tinc-0.3-patched/src: Makefile
Only in tinc-0.3-patched/src: bla
diff -ur tinc-0.3/src/net.c tinc-0.3-patched/src/net.c
--- tinc-0.3/src/net.c	Fri Aug 20 11:25:06 1999
+++ tinc-0.3-patched/src/net.c	Mon Oct 18 22:38:43 1999
@@ -127,18 +127,33 @@
   return done;
 }
 
+/*
+ * decrypt received udp packet, and write into tap device
+ */
 int xrecv(conn_list_t *cl, void *packet)
 {
   vpn_packet_t vp;
+  real_packet_t *rp_ptr;
   int lenin;
+  int rp_lenin;
+
+  rp_lenin = ((real_packet_t *) packet)->data.len;
+
+  /* encryption will crash when packet has unexpected len */
+  if ( ! ((rp_lenin > 20) && (rp_lenin < MAXSIZE))) {
+    syslog(LOG_ERR, "dropping strange packet len: %d", rp_lenin);
+    return 1;
+  } 
 
   do_decrypt((real_packet_t*)packet, &vp, cl->key);
   add_mac_addresses(&vp);
 
   if((lenin = write_n(tap_fd, &vp, vp.len + 2)) < 0)
     syslog(LOG_ERR, "Can't write to tap device: %m");
-  else
+  else {
     total_tap_out += lenin;
+    if(debug_lvl > 3) syslog(LOG_DEBUG, "writing in tap - %d -
%d", vp.len + 2, lenin);
+  }
 
   return 0;
 }
@@ -151,12 +166,21 @@
 {
   queue_element_t *e;
 
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "packet to queue: %d", s);
+  if(debug_lvl > 3) {
+    syslog(LOG_DEBUG, "packet to queue: %d", s - 2);
+dump_pkt_queue(*q);
+    if (*q) {
+  if((*q)->head)
+    syslog(LOG_DEBUG, "head != NULL");
+  if((*q)->tail)
+    syslog(LOG_DEBUG, "tail != NULL");
+    }
+   }
 
   e = xmalloc(sizeof(queue_element_t));
   e->packet = xmalloc(s);
   memcpy(e->packet, packet, s);
+
   if(!*q)
     {
       *q = xmalloc(sizeof(packet_queue_t));
@@ -165,10 +189,12 @@
 
   e->prev = (*q)->tail;
   e->next = NULL;
+
   if((*q)->tail)
     (*q)->tail->next = e;
 
   (*q)->tail = e;
+
   if(!(*q)->head)
     (*q)->head = e;
 }
@@ -181,32 +207,49 @@
 void flush_queue(conn_list_t *cl, packet_queue_t *pq,
 		 int (*function)(conn_list_t*,void*))
 {
+  int i=0;
+  real_packet_t *vp;
   queue_element_t *p, *prev = NULL, *next = NULL;
 
+  if(debug_lvl > 3) {
+  dump_conn_list();
+  }
+
   for(p = pq->head; p != NULL; )
     {
+      i++;
+      vp = (real_packet_t *) p->packet;
+      if(debug_lvl > 1) syslog(LOG_DEBUG, "flushing packet %d len:
%d", i, vp->len);
+
       next = p->next;
 
-cp
       if(!function(cl, p->packet))
-        {
+        { /* returned zero: remove packet and queue elem */
           if(prev)
             prev->next = next;
           else
             pq->head = next;
 
-cp
+          if(debug_lvl > 1) syslog(LOG_DEBUG, "freeing packet %d
", i);
+
           free(p->packet);
-cp
 	  free(p);
-cp
         }
       else
+        {
         prev = p;
-cp
+        }
 
       p = next;
     }
+  
+  /* adjust to last element left in queue */
+  if (prev)
+      pq->tail = prev;
+  else {
+      pq->tail = NULL;
+      pq->head = NULL;
+  }
 
   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "queue flushed");
@@ -219,15 +262,15 @@
 */
 void flush_queues(conn_list_t *cl)
 {
-cp
   if(cl->sq)
     {
       if(debug_lvl > 1)
 	syslog(LOG_DEBUG, "Flushing send queue for " IP_ADDR_S,
 	       IP_ADDR_V(cl->vpn_ip));
       flush_queue(cl, cl->sq, xsend);
+      if(debug_lvl > 1)
+dump_pkt_queue(cl->sq);
     }
-cp
 
   if(cl->rq)
     {
@@ -235,8 +278,9 @@
 	syslog(LOG_DEBUG, "Flushing receive queue for " IP_ADDR_S,
 	       IP_ADDR_V(cl->vpn_ip));
       flush_queue(cl, cl->rq, xrecv);
+      if(debug_lvl > 1)
+dump_pkt_queue(cl->rq);
     }
-cp
 }
 
 /*
@@ -265,7 +309,11 @@
 
   if(!cl->status.validkey)
     {
+      if(debug_lvl > 1)
+dump_pkt_queue(cl->sq);
       add_queue(&(cl->sq), packet, packet->len + 2);
+      if(debug_lvl > 1)
+dump_pkt_queue(cl->sq);
       if(!cl->status.waitingforkey)
 	send_key_request(to);
       return 0;
@@ -274,8 +322,12 @@
 cp
   if(!cl->status.active)
     {
+      if(debug_lvl > 1)
+dump_pkt_queue(cl->sq);
       add_queue(&(cl->sq), packet, packet->len + 2);
       if(debug_lvl > 1)
+dump_pkt_queue(cl->sq);
+      if(debug_lvl > 1)
 	syslog(LOG_INFO, IP_ADDR_S " is not ready, queueing packet.",
IP_ADDR_V(cl->vpn_ip));
       return 0; /* We don't want to mess up, do we? */
     }
@@ -766,7 +818,9 @@
 	xrecv(f, &rp);
       else
 	{
+dump_pkt_queue(f->rq);
 	  add_queue(&(f->rq), &rp, rp.len);
+dump_pkt_queue(f->rq);
 	  if(!cl->status.waitingforkey)
 	    send_key_request(rp.from);
 	}
Only in tinc-0.3-patched/src: net.c.org
diff -ur tinc-0.3/src/netutl.c tinc-0.3-patched/src/netutl.c
--- tinc-0.3/src/netutl.c	Sun Aug 15 14:01:20 1999
+++ tinc-0.3-patched/src/netutl.c	Mon Oct 18 20:18:21 1999
@@ -217,6 +217,25 @@
   return ip;
 }
 
+void dump_pkt_queue(packet_queue_t *pq)
+{
+  int i=0;
+  real_packet_t *vp;
+  queue_element_t *p, *q;
+
+  if(debug_lvl > 1) syslog(LOG_DEBUG, "dumping queue");
+
+  if (!pq) return;
+
+  for(p = pq->head; p != NULL; p = q)
+    {
+      i++;
+      vp = (real_packet_t *) p->packet;
+      if(debug_lvl > 1) syslog(LOG_DEBUG, "queue has packet %d len:
%d", i, vp->len);
+      q = p->next;
+    }
+}
+
 void dump_conn_list(void)
 {
   conn_list_t *p;
diff -ur tinc-0.3/src/netutl.h tinc-0.3-patched/src/netutl.h
--- tinc-0.3/src/netutl.h	Thu Aug 12 19:27:17 1999
+++ tinc-0.3-patched/src/netutl.h	Sun Oct 17 00:21:57 1999
@@ -31,5 +31,6 @@
 extern char *hostlookup(unsigned long);
 extern ip_mask_t *strtoip(char*);
 extern void dump_conn_list(void);
+extern void dump_pkt_queue(packet_queue_t *);
 
 #endif /* __TINC_NETUTL_H__ */
diff -ur tinc-0.3/src/tincd.c tinc-0.3-patched/src/tincd.c
--- tinc-0.3/src/tincd.c	Thu Aug 19 18:32:19 1999
+++ tinc-0.3-patched/src/tincd.c	Sat Oct 16 20:09:29 1999
@@ -427,8 +427,11 @@
     signal(SIGTERM, sigterm_handler);
   if(signal(SIGQUIT, SIG_IGN) != SIG_ERR)
     signal(SIGQUIT, sigquit_handler);
+/* looping sigsegv handler: want a core dump */
+/*
   if(signal(SIGSEGV, SIG_IGN) != SIG_ERR)
     signal(SIGSEGV, sigsegv_handler);
+*/
   if(signal(SIGHUP, SIG_IGN) != SIG_ERR)
     signal(SIGHUP, sighup_handler);
   signal(SIGPIPE, SIG_IGN);
Only in tinc-0.3-patched: stamp-h

Hans Bayle

1999-Oct-27 22:46 UTC

head link

patch for tinc-0.3.1

(sorry for using this list, but I cannot reach zarq directly)
-------------- next part --------------
Only in tinc-0.3.1p: Makefile
Only in tinc-0.3.1p/cipher: Makefile
Only in tinc-0.3.1p/cipher/blowfish: Makefile
Only in tinc-0.3.1p/cipher/idea: Makefile
Only in tinc-0.3.1p: config.cache
Only in tinc-0.3.1p: config.h
Only in tinc-0.3.1p: config.log
Only in tinc-0.3.1p: config.status
Only in tinc-0.3.1p/doc: Makefile
Only in tinc-0.3.1p/lib: Makefile
Only in tinc-0.3.1p: libtool
Only in tinc-0.3.1p/m4: Makefile
Only in tinc-0.3.1p/src: Makefile
diff -ur tinc-0.3.1/src/net.c tinc-0.3.1p/src/net.c
--- tinc-0.3.1/src/net.c	Wed Oct 20 21:38:19 1999
+++ tinc-0.3.1p/src/net.c	Tue Oct 26 22:44:58 1999
@@ -209,6 +209,14 @@
       p = next;
     }
 
+  /* adjust to last element left in queue, add_queue() needs tail pointer */
+  if (prev)
+      pq->tail = prev;
+  else {
+      pq->tail = NULL;
+      pq->head = NULL;
+  }
+
   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "queue flushed");
 }
@@ -710,7 +718,7 @@
     {
       if(p->status.meta)
 	FD_SET(p->meta_socket, fs);
-      if(p->status.active)
+      if(p->status.dataopen)
 	FD_SET(p->socket, fs);
     }
 
Only in tinc-0.3.1p: stamp-h

tinc - Oct 1999 - patch for tinc-0.3

patch for tinc-0.3

patch for tinc-0.3

patch for tinc-0.3

patch for tinc-0.3.1

Reasonably Related Threads