[Olsr-cvs] olsrd-current/src/cfgparser oparse.y, 1.38, 1.39 olsrd_conf.c, 1.61, 1.62

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/src/cfgparser
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26486/src/cfgparser

Modified Files:
	oparse.y olsrd_conf.c 
Log Message:
* bug fix: set "ipsize" and "maxplen" if we set the the "ip_version"


Index: olsrd_conf.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** olsrd_conf.c	8 Nov 2007 22:47:42 -0000	1.61
--- olsrd_conf.c	22 Nov 2007 11:43:36 -0000	1.62
***************
*** 428,431 ****
--- 428,433 ----
      cnf->host_emul = OLSR_FALSE;
      cnf->ip_version  = AF_INET;
+     cnf->ipsize = sizeof(struct in_addr);
+     cnf->maxplen = 32;
      cnf->allow_no_interfaces = DEF_ALLOW_NO_INTS;
      cnf->tos = DEF_TOS;

Index: oparse.y
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/oparse.y,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** oparse.y	16 Nov 2007 19:12:55 -0000	1.38
--- oparse.y	22 Nov 2007 11:43:36 -0000	1.39
***************
*** 652,657 ****
--- 652,661 ----
    if ($2->integer == 4) {
      olsr_cnf->ip_version = AF_INET;
+     olsr_cnf->ipsize = sizeof(struct in_addr);
+     olsr_cnf->maxplen = 32;
    } else if ($2->integer == 6) {
      olsr_cnf->ip_version = AF_INET6;
+     olsr_cnf->ipsize = sizeof(struct in6_addr);
+     olsr_cnf->maxplen = 128;
    } else {
      fprintf(stderr, "IPversion must be 4 or 6!\n");