From (spam-protected) Tue Apr 11 16:59:22 2006 From: (spam-protected) (Andreas Tønnesen) Date: Tue, 11 Apr 2006 14:59:22 +0000 Subject: [Olsr-cvs] olsrd-current/src/unix ifnet.c,1.35,1.36 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1971/src/unix Modified Files: ifnet.c Log Message: Fix for bug where main address is not updated when IP change is detected Index: ifnet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ifnet.c 10 Jan 2006 20:38:19 -0000 1.35 --- ifnet.c 11 Apr 2006 14:59:20 -0000 1.36 *************** *** 316,320 **** if(memcmp(&olsr_cnf->main_addr, ! &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, olsr_cnf->ipsize) == 0) { --- 316,320 ---- if(memcmp(&olsr_cnf->main_addr, ! &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, olsr_cnf->ipsize) == 0) { *************** *** 322,326 **** olsr_syslog(OLSR_LOG_INFO, "New main address: %s\n", sockaddr_to_string(&ifr.ifr_addr)); memcpy(&olsr_cnf->main_addr, ! &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, olsr_cnf->ipsize); } --- 322,326 ---- olsr_syslog(OLSR_LOG_INFO, "New main address: %s\n", sockaddr_to_string(&ifr.ifr_addr)); memcpy(&olsr_cnf->main_addr, ! &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, olsr_cnf->ipsize); } *************** *** 328,332 **** ifp->int_addr = ifr.ifr_addr; memcpy(&ifp->ip_addr, ! &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, olsr_cnf->ipsize); --- 328,332 ---- ifp->int_addr = ifr.ifr_addr; memcpy(&ifp->ip_addr, ! &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, olsr_cnf->ipsize); From (spam-protected) Tue Apr 11 20:43:14 2006 From: (spam-protected) (Andreas Tønnesen) Date: Tue, 11 Apr 2006 18:43:14 +0000 Subject: [Olsr-cvs] olsrd-current/lib/dot_draw/src olsrd_dot_draw.c, 1.21, 1.22 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/dot_draw/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30282/lib/dot_draw/src Modified Files: olsrd_dot_draw.c Log Message: Added IPC open to dot draw init Index: olsrd_dot_draw.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/dot_draw/src/olsrd_dot_draw.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** olsrd_dot_draw.c 7 Jan 2006 08:17:43 -0000 1.21 --- olsrd_dot_draw.c 11 Apr 2006 18:43:12 -0000 1.22 *************** *** 137,140 **** --- 137,142 ---- register_pcf(&pcf_event); + plugin_ipc_init(); + return 1; } *************** *** 238,241 **** --- 240,244 ---- /* Register with olsrd */ + printf("Adding socket with olsrd\n"); add_olsr_socket(ipc_socket, &ipc_action); ipc_socket_up = 1; From (spam-protected) Tue Apr 11 20:48:39 2006 From: (spam-protected) (Andreas Tønnesen) Date: Tue, 11 Apr 2006 18:48:39 +0000 Subject: [Olsr-cvs] olsrd-current/src/unix ifnet.c,1.31,1.31.2.1 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1693/src/unix Modified Files: Tag: olsrd_04 ifnet.c Log Message: Ported changes from head to 0.4 Index: ifnet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v retrieving revision 1.31 retrieving revision 1.31.2.1 diff -C2 -d -r1.31 -r1.31.2.1 *** ifnet.c 29 Dec 2005 18:37:16 -0000 1.31 --- ifnet.c 11 Apr 2006 18:48:37 -0000 1.31.2.1 *************** *** 311,315 **** if(memcmp(&main_addr, ! &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, ipsize) == 0) { --- 311,315 ---- if(memcmp(&main_addr, ! &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, ipsize) == 0) { *************** *** 317,321 **** olsr_syslog(OLSR_LOG_INFO, "New main address: %s\n", sockaddr_to_string(&ifr.ifr_addr)); memcpy(&main_addr, ! &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, ipsize); } --- 317,321 ---- olsr_syslog(OLSR_LOG_INFO, "New main address: %s\n", sockaddr_to_string(&ifr.ifr_addr)); memcpy(&main_addr, ! &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, ipsize); } *************** *** 323,327 **** ifp->int_addr = ifr.ifr_addr; memcpy(&ifp->ip_addr, ! &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, ipsize); --- 323,327 ---- ifp->int_addr = ifr.ifr_addr; memcpy(&ifp->ip_addr, ! &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, ipsize); From (spam-protected) Tue Apr 11 20:48:39 2006 From: (spam-protected) (Andreas Tønnesen) Date: Tue, 11 Apr 2006 18:48:39 +0000 Subject: [Olsr-cvs] olsrd-current/lib/dot_draw/src olsrd_dot_draw.c, 1.20, 1.20.2.1 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/dot_draw/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1693/lib/dot_draw/src Modified Files: Tag: olsrd_04 olsrd_dot_draw.c Log Message: Ported changes from head to 0.4 Index: olsrd_dot_draw.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/dot_draw/src/olsrd_dot_draw.c,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -C2 -d -r1.20 -r1.20.2.1 *** olsrd_dot_draw.c 30 Dec 2005 02:23:59 -0000 1.20 --- olsrd_dot_draw.c 11 Apr 2006 18:48:37 -0000 1.20.2.1 *************** *** 137,140 **** --- 137,142 ---- register_pcf(&pcf_event); + plugin_ipc_init(); + return 1; } *************** *** 238,241 **** --- 240,244 ---- /* Register with olsrd */ + printf("Adding socket with olsrd\n"); add_olsr_socket(ipc_socket, &ipc_action); ipc_socket_up = 1; From (spam-protected) Fri Apr 14 07:03:57 2006 From: (spam-protected) (Andreas Tønnesen) Date: Fri, 14 Apr 2006 05:03:57 +0000 Subject: [Olsr-cvs] olsrd-current/src main.c,1.83.2.3,1.83.2.4 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4622/src Modified Files: Tag: olsrd_04 main.c Log Message: Added nohandling of SIGPIPE since this signal made olsrd crash on openbsd Index: main.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/main.c,v retrieving revision 1.83.2.3 retrieving revision 1.83.2.4 diff -C2 -d -r1.83.2.3 -r1.83.2.4 *** main.c 10 Jan 2006 17:44:17 -0000 1.83.2.3 --- main.c 14 Apr 2006 05:03:55 -0000 1.83.2.4 *************** *** 393,396 **** --- 393,397 ---- signal(SIGINT, olsr_shutdown); signal(SIGTERM, olsr_shutdown); + signal(SIGPIPE, SIG_IGN); #endif From (spam-protected) Fri Apr 14 07:04:18 2006 From: (spam-protected) (Andreas Tønnesen) Date: Fri, 14 Apr 2006 05:04:18 +0000 Subject: [Olsr-cvs] olsrd-current/src main.c,1.88,1.89 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5196/src Modified Files: main.c Log Message: Added nohandling of SIGPIPE since this signal made olsrd crash on openbsd Index: main.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/main.c,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** main.c 10 Jan 2006 17:43:32 -0000 1.88 --- main.c 14 Apr 2006 05:04:16 -0000 1.89 *************** *** 393,396 **** --- 393,397 ---- signal(SIGINT, olsr_shutdown); signal(SIGTERM, olsr_shutdown); + signal(SIGPIPE, SIG_IGN); #endif From (spam-protected) Fri Apr 14 07:18:19 2006 From: (spam-protected) (Andreas Tønnesen) Date: Fri, 14 Apr 2006 05:18:19 +0000 Subject: [Olsr-cvs] olsrd-current/src/unix ifnet.c,1.31.2.1,1.31.2.2 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15104/src/unix Modified Files: Tag: olsrd_04 ifnet.c Log Message: Fix for interface IP change main address issue Index: ifnet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v retrieving revision 1.31.2.1 retrieving revision 1.31.2.2 diff -C2 -d -r1.31.2.1 -r1.31.2.2 *** ifnet.c 11 Apr 2006 18:48:37 -0000 1.31.2.1 --- ifnet.c 14 Apr 2006 05:18:16 -0000 1.31.2.2 *************** *** 311,315 **** if(memcmp(&main_addr, ! &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, ipsize) == 0) { --- 311,315 ---- if(memcmp(&main_addr, ! &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, ipsize) == 0) { From (spam-protected) Fri Apr 14 07:18:33 2006 From: (spam-protected) (Andreas Tønnesen) Date: Fri, 14 Apr 2006 05:18:33 +0000 Subject: [Olsr-cvs] olsrd-current/src/unix ifnet.c,1.36,1.37 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15245/src/unix Modified Files: ifnet.c Log Message: Fix for interface IP change main address issue Index: ifnet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ifnet.c 11 Apr 2006 14:59:20 -0000 1.36 --- ifnet.c 14 Apr 2006 05:18:31 -0000 1.37 *************** *** 316,320 **** if(memcmp(&olsr_cnf->main_addr, ! &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, olsr_cnf->ipsize) == 0) { --- 316,320 ---- if(memcmp(&olsr_cnf->main_addr, ! &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, olsr_cnf->ipsize) == 0) { From (spam-protected) Mon Apr 17 20:25:31 2006 From: (spam-protected) (Andreas Tønnesen) Date: Mon, 17 Apr 2006 18:25:31 +0000 Subject: [Olsr-cvs] olsrd-current/src interfaces.c, 1.27, 1.27.2.1 interfaces.h, 1.30, 1.30.2.1 olsr_cfg.h, 1.27, 1.27.2.1 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11652/src Modified Files: Tag: olsrd_04 interfaces.c interfaces.h olsr_cfg.h Log Message: Added new config options NicChgsPollInt and AutoDetectChanges Index: olsr_cfg.h =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/olsr_cfg.h,v retrieving revision 1.27 retrieving revision 1.27.2.1 diff -C2 -d -r1.27 -r1.27.2.1 *** olsr_cfg.h 17 Nov 2005 04:25:44 -0000 1.27 --- olsr_cfg.h 17 Apr 2006 18:25:29 -0000 1.27.2.1 *************** *** 48,51 **** --- 48,52 ---- /* Default valuse not declared in olsr_protocol.h */ #define DEF_POLLRATE 0.05 + #define DEF_NICCHGPOLLRT 2.5 #define DEF_WILL_AUTO OLSR_TRUE #define DEF_ALLOW_NO_INTS OLSR_TRUE *************** *** 67,70 **** --- 68,73 ---- #define MAX_POLLRATE 10.0 #define MIN_POLLRATE 0.01 + #define MAX_NICCHGPOLLRT 100.0 + #define MIN_NICCHGPOLLRT 1.0 #define MAX_DEBUGLVL 9 #define MIN_DEBUGLVL 0 *************** *** 121,124 **** --- 124,128 ---- struct olsr_msg_params hna_params; struct olsr_lq_mult *lq_mult; + olsr_bool autodetect_chg; }; *************** *** 205,208 **** --- 209,213 ---- struct hyst_param hysteresis_param; float pollrate; + float nic_chgs_pollrate; olsr_u8_t tc_redundancy; olsr_u8_t mpr_coverage; Index: interfaces.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/interfaces.c,v retrieving revision 1.27 retrieving revision 1.27.2.1 diff -C2 -d -r1.27 -r1.27.2.1 *** interfaces.c 3 Jun 2005 08:00:55 -0000 1.27 --- interfaces.c 17 Apr 2006 18:25:29 -0000 1.27.2.1 *************** *** 116,120 **** /* register network interface update function with scheduler */ ! olsr_register_scheduler_event(&check_interface_updates, NULL, IFCHANGES_POLL_INT, 0, NULL); return (ifnet == NULL) ? 0 : 1; --- 116,121 ---- /* register network interface update function with scheduler */ ! olsr_register_scheduler_event(&check_interface_updates, NULL, ! olsr_cnf->nic_chgs_pollrate, 0, NULL); return (ifnet == NULL) ? 0 : 1; Index: interfaces.h =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/interfaces.h,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -C2 -d -r1.30 -r1.30.2.1 *** interfaces.h 3 Jun 2005 08:00:55 -0000 1.30 --- interfaces.h 17 Apr 2006 18:25:29 -0000 1.30.2.1 *************** *** 150,157 **** #define IFCHG_IF_UPDATE 3 - /* The rate to poll for interface changes at */ - #define IFCHANGES_POLL_INT 2.5 - - /* The interface linked-list */ extern struct interface *ifnet; --- 150,153 ---- From (spam-protected) Mon Apr 17 20:25:32 2006 From: (spam-protected) (Andreas Tønnesen) Date: Mon, 17 Apr 2006 18:25:32 +0000 Subject: [Olsr-cvs] olsrd-current/src/cfgparser cfgfile_gen.c, 1.2, 1.2.2.1 olsrd_conf.c, 1.46, 1.46.2.1 oparse.y, 1.28, 1.28.2.1 oscan.lex, 1.20, 1.20.2.1 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/cfgparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11652/src/cfgparser Modified Files: Tag: olsrd_04 cfgfile_gen.c olsrd_conf.c oparse.y oscan.lex Log Message: Added new config options NicChgsPollInt and AutoDetectChanges Index: cfgfile_gen.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/cfgfile_gen.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** cfgfile_gen.c 30 Dec 2005 02:24:00 -0000 1.2 --- cfgfile_gen.c 17 Apr 2006 18:25:29 -0000 1.2.2.1 *************** *** 179,182 **** --- 179,186 ---- fprintf(fd, "Pollrate\t%0.2f\n", cnf->pollrate); + /* NIC Changes Pollrate */ + fprintf(fd, "# Interval to poll network interfaces for configuration\n# changes. Defaults to 2.5 seconds\n"); + fprintf(fd, "NicChgsPollInt\t%0.2f\n", cnf->nic_chgs_pollrate); + /* TC redundancy */ fprintf(fd, "# TC redundancy\n# Specifies how much neighbor info should\n# be sent in TC messages\n# Possible values are:\n# 0 - only send MPR selectors\n# 1 - send MPR selectors and MPRs\n# 2 - send all neighbors\n#\n# defaults to 0\n\n"); *************** *** 255,259 **** ! fprintf(fd, " # Emission and validity intervals.\n # If not defined, RFC proposed values will\n # in most cases be used.\n\n"); --- 259,264 ---- ! fprintf(fd, " # Olsrd can autodetect changes in\n # interface configurations. Enabled by default\n # turn off to save CPU.\n AutoDetectChanges: %s\n", in->cnf->autodetect_chg ? "yes" : "no"); ! fprintf(fd, " # Emission and validity intervals.\n # If not defined, RFC proposed values will\n # in most cases be used.\n\n"); Index: oscan.lex =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/oscan.lex,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -C2 -d -r1.20 -r1.20.2.1 *** oscan.lex 19 Nov 2005 08:49:44 -0000 1.20 --- oscan.lex 17 Apr 2006 18:25:29 -0000 1.20.2.1 *************** *** 277,280 **** --- 277,285 ---- } + "NicChgsPollInt" { + yylval = NULL; + return TOK_NICCHGSPOLLRT; + } + "Hna4" { yylval = NULL; *************** *** 446,450 **** return TOK_HNAVAL; } ! --- 451,458 ---- return TOK_HNAVAL; } ! "AutoDetectChanges" { ! yylval = NULL; ! return TOK_AUTODETCHG; ! } Index: olsrd_conf.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.c,v retrieving revision 1.46 retrieving revision 1.46.2.1 diff -C2 -d -r1.46 -r1.46.2.1 *** olsrd_conf.c 17 Nov 2005 04:25:44 -0000 1.46 --- olsrd_conf.c 17 Apr 2006 18:25:29 -0000 1.46.2.1 *************** *** 247,250 **** --- 247,259 ---- } + /* NIC Changes Pollrate */ + + if(cnf->nic_chgs_pollrate < MIN_NICCHGPOLLRT || + cnf->nic_chgs_pollrate > MAX_NICCHGPOLLRT) + { + fprintf(stderr, "NIC Changes Pollrate %0.2f is not allowed\n", cnf->nic_chgs_pollrate); + return -1; + } + /* TC redundancy */ *************** *** 449,452 **** --- 458,462 ---- cnf->pollrate = DEF_POLLRATE; + cnf->nic_chgs_pollrate = DEF_NICCHGPOLLRT; cnf->tc_redundancy = TC_REDUNDANCY; *************** *** 502,505 **** --- 512,516 ---- io->hna_params.emission_interval = HNA_INTERVAL; io->hna_params.validity_time = HNA_HOLD_TIME; + io->autodetect_chg = OLSR_TRUE; return io; *************** *** 560,563 **** --- 571,576 ---- printf("Pollrate : %0.2f\n", cnf->pollrate); + printf("NIC ChangPollrate: %0.2f\n", cnf->nic_chgs_pollrate); + printf("TC redundancy : %d\n", cnf->tc_redundancy); *************** *** 612,616 **** ipv6_buf, mult->val); } ! in = in->next; } --- 625,631 ---- ipv6_buf, mult->val); } ! ! printf("\tAutodetetc changes : %s\n", in->cnf->autodetect_chg ? "yes" : "no"); ! in = in->next; } Index: oparse.y =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/oparse.y,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -C2 -d -r1.28 -r1.28.2.1 *** oparse.y 17 Nov 2005 04:25:44 -0000 1.28 --- oparse.y 17 Apr 2006 18:25:29 -0000 1.28.2.1 *************** *** 146,149 **** --- 146,150 ---- %token TOK_HYSTLOWER %token TOK_POLLRATE + %token TOK_NICCHGSPOLLRT %token TOK_TCREDUNDANCY %token TOK_MPRCOVERAGE *************** *** 174,177 **** --- 175,179 ---- %token TOK_HNAINT %token TOK_HNAVAL + %token TOK_AUTODETCHG %token TOK_IP4_ADDR *************** *** 198,201 **** --- 200,204 ---- | fhystlower | fpollrate + | fnicchgspollrt | atcredundancy | amprcoverage *************** *** 273,276 **** --- 276,280 ---- | isethnaint | isethnaval + | isetautodetchg | isetlqmult ; *************** *** 628,631 **** --- 632,652 ---- } ; + isetautodetchg: TOK_AUTODETCHG TOK_BOOLEAN + { + int ifcnt = ifs_in_curr_cfg; + struct olsr_if *ifs = cnf->interfaces; + + if(PARSER_DEBUG) printf("\tAutodetect changes: %s\n", $2->boolean ? "YES" : "NO"); + while(ifcnt) + { + ifs->cnf->autodetect_chg = $2->boolean; + + ifs = ifs->next; + ifcnt--; + } + + free($2); + } + ; isetlqmult: TOK_LQ_MULT TOK_DEFAULT TOK_FLOAT *************** *** 875,878 **** --- 896,907 ---- ; + fnicchgspollrt: TOK_NICCHGSPOLLRT TOK_FLOAT + { + if(PARSER_DEBUG) printf("NIC Changes Pollrate %0.2f\n", $2->floating); + cnf->nic_chgs_pollrate = $2->floating; + + free($2); + } + ; atcredundancy: TOK_TCREDUNDANCY TOK_INTEGER From (spam-protected) Mon Apr 17 20:25:32 2006 From: (spam-protected) (Andreas Tønnesen) Date: Mon, 17 Apr 2006 18:25:32 +0000 Subject: [Olsr-cvs] olsrd-current/src/unix ifnet.c,1.31.2.2,1.31.2.3 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11652/src/unix Modified Files: Tag: olsrd_04 ifnet.c Log Message: Added new config options NicChgsPollInt and AutoDetectChanges Index: ifnet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v retrieving revision 1.31.2.2 retrieving revision 1.31.2.3 diff -C2 -d -r1.31.2.2 -r1.31.2.3 *** ifnet.c 14 Apr 2006 05:18:16 -0000 1.31.2.2 --- ifnet.c 17 Apr 2006 18:25:30 -0000 1.31.2.3 *************** *** 123,130 **** continue; if(tmp_if->configured) ! chk_if_changed(tmp_if); else ! chk_if_up(tmp_if, 3); } --- 123,143 ---- continue; + if(!tmp_if->cnf->autodetect_chg) + { + #ifdef DEBUG + /* Don't check this interface */ + OLSR_PRINTF(3, "Not checking interface %s\n", tmp_if->name) + #endif + continue; + } + if(tmp_if->configured) ! { ! chk_if_changed(tmp_if); ! } else ! { ! chk_if_up(tmp_if, 3); ! } } From (spam-protected) Mon Apr 17 20:29:37 2006 From: (spam-protected) (Andreas Tønnesen) Date: Mon, 17 Apr 2006 18:29:37 +0000 Subject: [Olsr-cvs] olsrd-current/files olsrd.conf.default.lq, 1.1, 1.1.2.1 olsrd.conf.default.lq-fisheye, 1.2, 1.2.2.1 olsrd.conf.default.rfc, 1.2, 1.2.2.1 olsrd.conf.win32.lq, 1.1, 1.1.2.1 olsrd.conf.win32.rfc, 1.1, 1.1.2.1 Message-ID: Update of /cvsroot/olsrd/olsrd-current/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14687 Modified Files: Tag: olsrd_04 olsrd.conf.default.lq olsrd.conf.default.lq-fisheye olsrd.conf.default.rfc olsrd.conf.win32.lq olsrd.conf.win32.rfc Log Message: Added new config options NicChgsPollInt and AutoDetectChanges Index: olsrd.conf.win32.rfc =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.win32.rfc,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** olsrd.conf.win32.rfc 31 Mar 2005 18:19:54 -0000 1.1 --- olsrd.conf.win32.rfc 17 Apr 2006 18:29:35 -0000 1.1.2.1 *************** *** 59,62 **** --- 59,67 ---- Pollrate 0.1 + # Interval to poll network interfaces for configuration + # changes. Defaults to 2.5 seconds + + NicChgsPollInt 3.0 + # # Which neighbours should be advertised via TC messages? *************** *** 117,120 **** --- 122,135 ---- Interface "if99" { + # Olsrd can autodetect changes in NIC + # configurations(IP address changes etc.). + # This is Enabled by default and the interval + # to poll for changes on is defined by + # NicChgsPollInt. + # This polling can be disabled pr. NIC by setting + # AutoDetectChanges to no. + + # AutoDetectChanges yes + # # HELLO interval and validity time in seconds (float) Index: olsrd.conf.default.rfc =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.default.rfc,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** olsrd.conf.default.rfc 4 Jun 2005 15:34:05 -0000 1.2 --- olsrd.conf.default.rfc 17 Apr 2006 18:29:35 -0000 1.2.2.1 *************** *** 129,132 **** --- 129,136 ---- Pollrate 0.05 + # Interval to poll network interfaces for configuration + # changes. Defaults to 2.5 seconds + + NicChgsPollInt 3.0 # TC redundancy *************** *** 201,204 **** --- 205,217 ---- Interface "XXX" "YYY" { + # Olsrd can autodetect changes in NIC + # configurations(IP address changes etc.). + # This is Enabled by default and the interval + # to poll for changes on is defined by + # NicChgsPollInt. + # This polling can be disabled pr. NIC by setting + # AutoDetectChanges to no. + + # AutoDetectChanges yes # IPv4 broadcast address to use. The Index: olsrd.conf.default.lq-fisheye =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.default.lq-fisheye,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** olsrd.conf.default.lq-fisheye 17 Dec 2005 07:30:34 -0000 1.2 --- olsrd.conf.default.lq-fisheye 17 Apr 2006 18:29:35 -0000 1.2.2.1 *************** *** 142,145 **** --- 142,149 ---- Pollrate 0.05 + # Interval to poll network interfaces for configuration + # changes. Defaults to 2.5 seconds + + NicChgsPollInt 3.0 # TC redundancy *************** *** 215,218 **** --- 219,232 ---- { + # Olsrd can autodetect changes in NIC + # configurations(IP address changes etc.). + # This is Enabled by default and the interval + # to poll for changes on is defined by + # NicChgsPollInt. + # This polling can be disabled pr. NIC by setting + # AutoDetectChanges to no. + + # AutoDetectChanges yes + # IPv4 broadcast address to use. The # one usefull example would be 255.255.255.255 Index: olsrd.conf.default.lq =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.default.lq,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** olsrd.conf.default.lq 31 Mar 2005 18:35:23 -0000 1.1 --- olsrd.conf.default.lq 17 Apr 2006 18:29:34 -0000 1.1.2.1 *************** *** 134,137 **** --- 134,141 ---- Pollrate 0.05 + # Interval to poll network interfaces for configuration + # changes. Defaults to 2.5 seconds + + NicChgsPollInt 3.0 # TC redundancy *************** *** 206,209 **** --- 210,222 ---- Interface "XXX" "YYY" { + # Olsrd can autodetect changes in NIC + # configurations(IP address changes etc.). + # This is Enabled by default and the interval + # to poll for changes on is defined by + # NicChgsPollInt. + # This polling can be disabled pr. NIC by setting + # AutoDetectChanges to no. + + # AutoDetectChanges yes # IPv4 broadcast address to use. The Index: olsrd.conf.win32.lq =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.win32.lq,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** olsrd.conf.win32.lq 31 Mar 2005 18:19:54 -0000 1.1 --- olsrd.conf.win32.lq 17 Apr 2006 18:29:35 -0000 1.1.2.1 *************** *** 59,62 **** --- 59,67 ---- Pollrate 0.1 + # Interval to poll network interfaces for configuration + # changes. Defaults to 2.5 seconds + + NicChgsPollInt 3.0 + # # Which neighbours should be advertised via TC messages? *************** *** 117,120 **** --- 122,135 ---- Interface "if99" { + # Olsrd can autodetect changes in NIC + # configurations(IP address changes etc.). + # This is Enabled by default and the interval + # to poll for changes on is defined by + # NicChgsPollInt. + # This polling can be disabled pr. NIC by setting + # AutoDetectChanges to no. + + # AutoDetectChanges yes + # # HELLO interval and validity time in seconds (float) From (spam-protected) Mon Apr 17 20:31:11 2006 From: (spam-protected) (Andreas Tønnesen) Date: Mon, 17 Apr 2006 18:31:11 +0000 Subject: [Olsr-cvs] olsrd-current/src/cfgparser cfgfile_gen.c, 1.2, 1.3 olsrd_conf.c, 1.48, 1.49 oparse.y, 1.28, 1.29 oscan.lex, 1.20, 1.21 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/cfgparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15372/src/cfgparser Modified Files: cfgfile_gen.c olsrd_conf.c oparse.y oscan.lex Log Message: Added new config options NicChgsPollInt and AutoDetectChanges Index: cfgfile_gen.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/cfgfile_gen.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cfgfile_gen.c 30 Dec 2005 02:24:00 -0000 1.2 --- cfgfile_gen.c 17 Apr 2006 18:31:09 -0000 1.3 *************** *** 179,182 **** --- 179,186 ---- fprintf(fd, "Pollrate\t%0.2f\n", cnf->pollrate); + /* NIC Changes Pollrate */ + fprintf(fd, "# Interval to poll network interfaces for configuration\n# changes. Defaults to 2.5 seconds\n"); + fprintf(fd, "NicChgsPollInt\t%0.2f\n", cnf->nic_chgs_pollrate); + /* TC redundancy */ fprintf(fd, "# TC redundancy\n# Specifies how much neighbor info should\n# be sent in TC messages\n# Possible values are:\n# 0 - only send MPR selectors\n# 1 - send MPR selectors and MPRs\n# 2 - send all neighbors\n#\n# defaults to 0\n\n"); *************** *** 255,259 **** ! fprintf(fd, " # Emission and validity intervals.\n # If not defined, RFC proposed values will\n # in most cases be used.\n\n"); --- 259,264 ---- ! fprintf(fd, " # Olsrd can autodetect changes in\n # interface configurations. Enabled by default\n # turn off to save CPU.\n AutoDetectChanges: %s\n", in->cnf->autodetect_chg ? "yes" : "no"); ! fprintf(fd, " # Emission and validity intervals.\n # If not defined, RFC proposed values will\n # in most cases be used.\n\n"); Index: oscan.lex =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/oscan.lex,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** oscan.lex 19 Nov 2005 08:49:44 -0000 1.20 --- oscan.lex 17 Apr 2006 18:31:09 -0000 1.21 *************** *** 277,280 **** --- 277,285 ---- } + "NicChgsPollInt" { + yylval = NULL; + return TOK_NICCHGSPOLLRT; + } + "Hna4" { yylval = NULL; *************** *** 446,450 **** return TOK_HNAVAL; } ! --- 451,458 ---- return TOK_HNAVAL; } ! "AutoDetectChanges" { ! yylval = NULL; ! return TOK_AUTODETCHG; ! } Index: olsrd_conf.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.c,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** olsrd_conf.c 9 Mar 2006 15:05:27 -0000 1.48 --- olsrd_conf.c 17 Apr 2006 18:31:09 -0000 1.49 *************** *** 247,250 **** --- 247,259 ---- } + /* NIC Changes Pollrate */ + + if(cnf->nic_chgs_pollrate < MIN_NICCHGPOLLRT || + cnf->nic_chgs_pollrate > MAX_NICCHGPOLLRT) + { + fprintf(stderr, "NIC Changes Pollrate %0.2f is not allowed\n", cnf->nic_chgs_pollrate); + return -1; + } + /* TC redundancy */ *************** *** 449,452 **** --- 458,462 ---- cnf->pollrate = DEF_POLLRATE; + cnf->nic_chgs_pollrate = DEF_NICCHGPOLLRT; cnf->tc_redundancy = TC_REDUNDANCY; *************** *** 502,505 **** --- 512,516 ---- io->hna_params.emission_interval = HNA_INTERVAL; io->hna_params.validity_time = HNA_HOLD_TIME; + io->autodetect_chg = OLSR_TRUE; return io; *************** *** 560,563 **** --- 571,576 ---- printf("Pollrate : %0.2f\n", cnf->pollrate); + printf("NIC ChangPollrate: %0.2f\n", cnf->nic_chgs_pollrate); + printf("TC redundancy : %d\n", cnf->tc_redundancy); *************** *** 612,616 **** ipv6_buf, mult->val); } ! in = in->next; } --- 625,631 ---- ipv6_buf, mult->val); } ! ! printf("\tAutodetetc changes : %s\n", in->cnf->autodetect_chg ? "yes" : "no"); ! in = in->next; } Index: oparse.y =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/oparse.y,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** oparse.y 17 Nov 2005 04:25:44 -0000 1.28 --- oparse.y 17 Apr 2006 18:31:09 -0000 1.29 *************** *** 146,149 **** --- 146,150 ---- %token TOK_HYSTLOWER %token TOK_POLLRATE + %token TOK_NICCHGSPOLLRT %token TOK_TCREDUNDANCY %token TOK_MPRCOVERAGE *************** *** 174,177 **** --- 175,179 ---- %token TOK_HNAINT %token TOK_HNAVAL + %token TOK_AUTODETCHG %token TOK_IP4_ADDR *************** *** 198,201 **** --- 200,204 ---- | fhystlower | fpollrate + | fnicchgspollrt | atcredundancy | amprcoverage *************** *** 273,276 **** --- 276,280 ---- | isethnaint | isethnaval + | isetautodetchg | isetlqmult ; *************** *** 628,631 **** --- 632,652 ---- } ; + isetautodetchg: TOK_AUTODETCHG TOK_BOOLEAN + { + int ifcnt = ifs_in_curr_cfg; + struct olsr_if *ifs = cnf->interfaces; + + if(PARSER_DEBUG) printf("\tAutodetect changes: %s\n", $2->boolean ? "YES" : "NO"); + while(ifcnt) + { + ifs->cnf->autodetect_chg = $2->boolean; + + ifs = ifs->next; + ifcnt--; + } + + free($2); + } + ; isetlqmult: TOK_LQ_MULT TOK_DEFAULT TOK_FLOAT *************** *** 875,878 **** --- 896,907 ---- ; + fnicchgspollrt: TOK_NICCHGSPOLLRT TOK_FLOAT + { + if(PARSER_DEBUG) printf("NIC Changes Pollrate %0.2f\n", $2->floating); + cnf->nic_chgs_pollrate = $2->floating; + + free($2); + } + ; atcredundancy: TOK_TCREDUNDANCY TOK_INTEGER From (spam-protected) Mon Apr 17 20:31:11 2006 From: (spam-protected) (Andreas Tønnesen) Date: Mon, 17 Apr 2006 18:31:11 +0000 Subject: [Olsr-cvs] olsrd-current/files olsrd.conf.5.gz, 1.7, 1.8 olsrd.conf.default.lq, 1.1, 1.2 olsrd.conf.default.lq-fisheye, 1.2, 1.3 olsrd.conf.default.rfc, 1.2, 1.3 olsrd.conf.win32.lq, 1.1, 1.2 olsrd.conf.win32.rfc, 1.1, 1.2 Message-ID: Update of /cvsroot/olsrd/olsrd-current/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15372/files Modified Files: olsrd.conf.5.gz olsrd.conf.default.lq olsrd.conf.default.lq-fisheye olsrd.conf.default.rfc olsrd.conf.win32.lq olsrd.conf.win32.rfc Log Message: Added new config options NicChgsPollInt and AutoDetectChanges Index: olsrd.conf.5.gz =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.5.gz,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 Binary files /tmp/cvs29fuVe and /tmp/cvs98h8Re differ Index: olsrd.conf.default.lq =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.default.lq,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** olsrd.conf.default.lq 31 Mar 2005 18:35:23 -0000 1.1 --- olsrd.conf.default.lq 17 Apr 2006 18:31:08 -0000 1.2 *************** *** 134,137 **** --- 134,141 ---- Pollrate 0.05 + # Interval to poll network interfaces for configuration + # changes. Defaults to 2.5 seconds + + NicChgsPollInt 3.0 # TC redundancy *************** *** 206,209 **** --- 210,222 ---- Interface "XXX" "YYY" { + # Olsrd can autodetect changes in NIC + # configurations(IP address changes etc.). + # This is Enabled by default and the interval + # to poll for changes on is defined by + # NicChgsPollInt. + # This polling can be disabled pr. NIC by setting + # AutoDetectChanges to no. + + # AutoDetectChanges yes # IPv4 broadcast address to use. The Index: olsrd.conf.default.rfc =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.default.rfc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** olsrd.conf.default.rfc 4 Jun 2005 15:34:05 -0000 1.2 --- olsrd.conf.default.rfc 17 Apr 2006 18:31:08 -0000 1.3 *************** *** 129,132 **** --- 129,136 ---- Pollrate 0.05 + # Interval to poll network interfaces for configuration + # changes. Defaults to 2.5 seconds + + NicChgsPollInt 3.0 # TC redundancy *************** *** 201,204 **** --- 205,217 ---- Interface "XXX" "YYY" { + # Olsrd can autodetect changes in NIC + # configurations(IP address changes etc.). + # This is Enabled by default and the interval + # to poll for changes on is defined by + # NicChgsPollInt. + # This polling can be disabled pr. NIC by setting + # AutoDetectChanges to no. + + # AutoDetectChanges yes # IPv4 broadcast address to use. The Index: olsrd.conf.default.lq-fisheye =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.default.lq-fisheye,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** olsrd.conf.default.lq-fisheye 17 Dec 2005 07:30:34 -0000 1.2 --- olsrd.conf.default.lq-fisheye 17 Apr 2006 18:31:08 -0000 1.3 *************** *** 142,145 **** --- 142,149 ---- Pollrate 0.05 + # Interval to poll network interfaces for configuration + # changes. Defaults to 2.5 seconds + + NicChgsPollInt 3.0 # TC redundancy *************** *** 215,218 **** --- 219,232 ---- { + # Olsrd can autodetect changes in NIC + # configurations(IP address changes etc.). + # This is Enabled by default and the interval + # to poll for changes on is defined by + # NicChgsPollInt. + # This polling can be disabled pr. NIC by setting + # AutoDetectChanges to no. + + # AutoDetectChanges yes + # IPv4 broadcast address to use. The # one usefull example would be 255.255.255.255 Index: olsrd.conf.win32.rfc =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.win32.rfc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** olsrd.conf.win32.rfc 31 Mar 2005 18:19:54 -0000 1.1 --- olsrd.conf.win32.rfc 17 Apr 2006 18:31:08 -0000 1.2 *************** *** 59,62 **** --- 59,67 ---- Pollrate 0.1 + # Interval to poll network interfaces for configuration + # changes. Defaults to 2.5 seconds + + NicChgsPollInt 3.0 + # # Which neighbours should be advertised via TC messages? *************** *** 117,120 **** --- 122,135 ---- Interface "if99" { + # Olsrd can autodetect changes in NIC + # configurations(IP address changes etc.). + # This is Enabled by default and the interval + # to poll for changes on is defined by + # NicChgsPollInt. + # This polling can be disabled pr. NIC by setting + # AutoDetectChanges to no. + + # AutoDetectChanges yes + # # HELLO interval and validity time in seconds (float) Index: olsrd.conf.win32.lq =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.win32.lq,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** olsrd.conf.win32.lq 31 Mar 2005 18:19:54 -0000 1.1 --- olsrd.conf.win32.lq 17 Apr 2006 18:31:08 -0000 1.2 *************** *** 59,62 **** --- 59,67 ---- Pollrate 0.1 + # Interval to poll network interfaces for configuration + # changes. Defaults to 2.5 seconds + + NicChgsPollInt 3.0 + # # Which neighbours should be advertised via TC messages? *************** *** 117,120 **** --- 122,135 ---- Interface "if99" { + # Olsrd can autodetect changes in NIC + # configurations(IP address changes etc.). + # This is Enabled by default and the interval + # to poll for changes on is defined by + # NicChgsPollInt. + # This polling can be disabled pr. NIC by setting + # AutoDetectChanges to no. + + # AutoDetectChanges yes + # # HELLO interval and validity time in seconds (float) From (spam-protected) Mon Apr 17 20:31:11 2006 From: (spam-protected) (Andreas Tønnesen) Date: Mon, 17 Apr 2006 18:31:11 +0000 Subject: [Olsr-cvs] olsrd-current/src/unix ifnet.c,1.37,1.38 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15372/src/unix Modified Files: ifnet.c Log Message: Added new config options NicChgsPollInt and AutoDetectChanges Index: ifnet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** ifnet.c 14 Apr 2006 05:18:31 -0000 1.37 --- ifnet.c 17 Apr 2006 18:31:09 -0000 1.38 *************** *** 128,135 **** continue; if(tmp_if->configured) ! chk_if_changed(tmp_if); else ! chk_if_up(tmp_if, 3); } --- 128,148 ---- continue; + if(!tmp_if->cnf->autodetect_chg) + { + #ifdef DEBUG + /* Don't check this interface */ + OLSR_PRINTF(3, "Not checking interface %s\n", tmp_if->name) + #endif + continue; + } + if(tmp_if->configured) ! { ! chk_if_changed(tmp_if); ! } else ! { ! chk_if_up(tmp_if, 3); ! } } From (spam-protected) Mon Apr 17 20:31:11 2006 From: (spam-protected) (Andreas Tønnesen) Date: Mon, 17 Apr 2006 18:31:11 +0000 Subject: [Olsr-cvs] olsrd-current/src interfaces.c, 1.28, 1.29 interfaces.h, 1.32, 1.33 olsr_cfg.h, 1.29, 1.30 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15372/src Modified Files: interfaces.c interfaces.h olsr_cfg.h Log Message: Added new config options NicChgsPollInt and AutoDetectChanges Index: olsr_cfg.h =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/olsr_cfg.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** olsr_cfg.h 7 Jan 2006 08:16:20 -0000 1.29 --- olsr_cfg.h 17 Apr 2006 18:31:09 -0000 1.30 *************** *** 48,51 **** --- 48,52 ---- /* Default valuse not declared in olsr_protocol.h */ #define DEF_POLLRATE 0.05 + #define DEF_NICCHGPOLLRT 2.5 #define DEF_WILL_AUTO OLSR_TRUE #define DEF_ALLOW_NO_INTS OLSR_TRUE *************** *** 67,70 **** --- 68,73 ---- #define MAX_POLLRATE 10.0 #define MIN_POLLRATE 0.01 + #define MAX_NICCHGPOLLRT 100.0 + #define MIN_NICCHGPOLLRT 1.0 #define MAX_DEBUGLVL 9 #define MIN_DEBUGLVL 0 *************** *** 121,124 **** --- 124,128 ---- struct olsr_msg_params hna_params; struct olsr_lq_mult *lq_mult; + olsr_bool autodetect_chg; }; *************** *** 205,208 **** --- 209,213 ---- struct hyst_param hysteresis_param; float pollrate; + float nic_chgs_pollrate; olsr_u8_t tc_redundancy; olsr_u8_t mpr_coverage; Index: interfaces.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/interfaces.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** interfaces.c 7 Jan 2006 08:16:20 -0000 1.28 --- interfaces.c 17 Apr 2006 18:31:09 -0000 1.29 *************** *** 116,120 **** /* register network interface update function with scheduler */ ! olsr_register_scheduler_event(&check_interface_updates, NULL, IFCHANGES_POLL_INT, 0, NULL); return (ifnet == NULL) ? 0 : 1; --- 116,121 ---- /* register network interface update function with scheduler */ ! olsr_register_scheduler_event(&check_interface_updates, NULL, ! olsr_cnf->nic_chgs_pollrate, 0, NULL); return (ifnet == NULL) ? 0 : 1; Index: interfaces.h =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/interfaces.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** interfaces.h 7 Jan 2006 08:16:20 -0000 1.32 --- interfaces.h 17 Apr 2006 18:31:09 -0000 1.33 *************** *** 155,162 **** #define IFCHG_IF_UPDATE 3 - /* The rate to poll for interface changes at */ - #define IFCHANGES_POLL_INT 2.5 - - /* The interface linked-list */ extern struct interface *ifnet; --- 155,158 ----