1 diff -Nur olsrd-0.4.10.orig/lib/dot_draw/src/olsrd_dot_draw.c olsrd-0.4.10/lib/dot_draw/src/olsrd_dot_draw.c
2 --- olsrd-0.4.10.orig/lib/dot_draw/src/olsrd_dot_draw.c 2005-12-30 03:23:59.000000000 +0100
3 +++ olsrd-0.4.10/lib/dot_draw/src/olsrd_dot_draw.c 2006-12-01 20:23:37.000000000 +0100
5 /* Register the "ProcessChanges" function */
6 register_pcf(&pcf_event);
16 /* Register with olsrd */
17 + printf("Adding socket with olsrd\n");
18 add_olsr_socket(ipc_socket, &ipc_action);
21 diff -Nur olsrd-0.4.10.orig/lib/httpinfo/src/olsrd_httpinfo.c olsrd-0.4.10/lib/httpinfo/src/olsrd_httpinfo.c
22 --- olsrd-0.4.10.orig/lib/httpinfo/src/olsrd_httpinfo.c 2006-12-01 20:20:31.000000000 +0100
23 +++ olsrd-0.4.10/lib/httpinfo/src/olsrd_httpinfo.c 2006-12-01 20:23:37.000000000 +0100
25 if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) == -1)
27 olsr_printf(1, "(HTTPINFO) bind failed %s\n", strerror(errno));
33 if (listen(s, 1) == -1)
35 olsr_printf(1, "(HTTPINFO) listen failed %s\n", strerror(errno));
40 diff -Nur olsrd-0.4.10.orig/lib/secure/src/olsrd_secure.c olsrd-0.4.10/lib/secure/src/olsrd_secure.c
41 --- olsrd-0.4.10.orig/lib/secure/src/olsrd_secure.c 2005-11-19 09:37:23.000000000 +0100
42 +++ olsrd-0.4.10/lib/secure/src/olsrd_secure.c 2006-12-01 20:23:37.000000000 +0100
46 /* Check configuration timeout */
47 - if(!TIMED_OUT(&entry->conftime))
48 + if(!TIMED_OUT(entry->conftime))
50 /* If registered - do not accept! */
51 olsr_printf(1, "[ENC]Challenge from registered node...dropping!\n");
53 while(tmp_list != ×tamps[index])
55 /*Check if the entry is timed out*/
56 - if((TIMED_OUT(&tmp_list->valtime)) && (TIMED_OUT(&tmp_list->conftime)))
57 + if((TIMED_OUT(tmp_list->valtime)) && (TIMED_OUT(tmp_list->conftime)))
59 entry_to_delete = tmp_list;
60 tmp_list = tmp_list->next;
61 diff -Nur olsrd-0.4.10.orig/make/Makefile.linux olsrd-0.4.10/make/Makefile.linux
62 --- olsrd-0.4.10.orig/make/Makefile.linux 2005-11-19 09:43:51.000000000 +0100
63 +++ olsrd-0.4.10/make/Makefile.linux 2006-12-01 20:23:37.000000000 +0100
68 +ifeq ($(shell arch),x86_64)
69 +LIBDIR = $(INSTALL_PREFIX)/usr/lib64
71 LIBDIR = $(INSTALL_PREFIX)/usr/lib
74 SRCS += $(wildcard src/linux/*.c) $(wildcard src/unix/*.c)
75 HDRS += $(wildcard src/linux/*.h) $(wildcard src/unix/*.h)
76 diff -Nur olsrd-0.4.10.orig/make/Makefile.osx olsrd-0.4.10/make/Makefile.osx
77 --- olsrd-0.4.10.orig/make/Makefile.osx 2005-12-29 20:48:43.000000000 +0100
78 +++ olsrd-0.4.10/make/Makefile.osx 2006-12-01 20:23:37.000000000 +0100
80 # MAC OSX SPECIFIC CONFIGURATION
83 +# don't strip executables and bundles for now until we figure out the proper way
88 LIBDIR = $(INSTALL_PREFIX)/usr/lib
93 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
94 -INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
96 +INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME)
100 -LDFLAGS = -fPIC -dynamiclib -single_module -flat_namespace -undefined suppress
101 +LDFLAGS = -bundle -flat_namespace -undefined suppress
105 diff -Nur olsrd-0.4.10.orig/Makefile olsrd-0.4.10/Makefile
106 --- olsrd-0.4.10.orig/Makefile 2006-12-01 20:20:31.000000000 +0100
107 +++ olsrd-0.4.10/Makefile 2006-12-01 20:23:37.000000000 +0100
110 build_all: cfgparser olsrd libs
111 install_all: install install_libs
112 +clean_all: uberclean clean_libs
113 diff -Nur olsrd-0.4.10.orig/src/bsd/net.c olsrd-0.4.10/src/bsd/net.c
114 --- olsrd-0.4.10.orig/src/bsd/net.c 2005-08-28 21:30:29.000000000 +0200
115 +++ olsrd-0.4.10/src/bsd/net.c 2006-12-01 20:23:37.000000000 +0100
117 if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
119 perror("SO_REUSEADDR failed");
123 /* connect to PORT on HOST */
126 fprintf(stderr, "Error connecting %d - %s\n", errno, strerror(errno));
127 printf("connection refused\n");
133 if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
135 perror("SO_REUSEADDR failed");
140 @@ -339,12 +342,14 @@
141 if (setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) < 0)
143 perror("SO_REUSEPORT failed");
148 if (setsockopt(sock, IPPROTO_IP, IP_RECVIF, &on, sizeof(on)) < 0)
150 perror("IP_RECVIF failed");
156 if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
158 perror("SO_REUSEADDR failed");
163 diff -Nur olsrd-0.4.10.orig/src/linux/net.c olsrd-0.4.10/src/linux/net.c
164 --- olsrd-0.4.10.orig/src/linux/net.c 2005-09-17 22:48:50.000000000 +0200
165 +++ olsrd-0.4.10/src/linux/net.c 2006-12-01 20:23:37.000000000 +0100
167 if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
169 perror("SO_REUSEADDR failed");
173 /* connect to PORT on HOST */
176 fprintf(stderr, "Error connecting %d - %s\n", errno, strerror(errno));
177 printf("connection refused\n");
183 if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
185 perror("SO_REUSEADDR failed");
192 fprintf(stderr, "Could not bind socket to device... exiting!\n\n");
193 syslog(LOG_ERR, "Could not bind socket to device... exiting!\n\n");
199 if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
201 perror("SO_REUSEADDR failed");
208 fprintf(stderr, "Could not bind socket to device... exiting!\n\n");
209 syslog(LOG_ERR, "Could not bind socket to device... exiting!\n\n");
214 diff -Nur olsrd-0.4.10.orig/src/main.c olsrd-0.4.10/src/main.c
215 --- olsrd-0.4.10.orig/src/main.c 2006-12-01 20:20:31.000000000 +0100
216 +++ olsrd-0.4.10/src/main.c 2006-12-01 20:23:54.000000000 +0100
218 system_tick_divider = 1000/sysconf(_SC_CLK_TCK);
220 /* Check if user is root */
221 - if(getuid() || getgid())
224 fprintf(stderr, "You must be root(uid = 0) to run olsrd!\nExiting\n\n");
227 signal(SIGHUP, olsr_reconfigure);
228 signal(SIGINT, olsr_shutdown);
229 signal(SIGTERM, olsr_shutdown);
230 + signal(SIGPIPE, SIG_IGN);
233 /* Register socket poll event */
235 fprintf(stderr, " [-hint <hello interval (secs)>] [-tcint <tc interval (secs)>]\n");
236 fprintf(stderr, " [-midint <mid interval (secs)>] [-hnaint <hna interval (secs)>]\n");
237 fprintf(stderr, " [-T <Polling Rate (secs)>] [-nofork] [-hemu <ip_address>] \n");
238 + fprintf(stderr, " [-lql <LQ level>] [-lqw <LQ winsize>]\n");
243 memcpy(&ifcnf->ipv4_broadcast.v4, &in.s_addr, sizeof(olsr_u32_t));
250 + if (strcmp(*argv, "-lql") == 0)
256 + /* Sanity checking is done later */
257 + sscanf(*argv, "%d", &tmp_lq_level);
258 + olsr_cnf->lq_level = tmp_lq_level;
265 + if (strcmp(*argv, "-lqw") == 0)
271 + sscanf(*argv, "%d", &tmp_lq_wsize);
273 + if(tmp_lq_wsize < MIN_LQ_WSIZE || tmp_lq_wsize > MAX_LQ_WSIZE)
275 + printf("LQ winsize %d not allowed. Range [%d-%d]\n",
276 + tmp_lq_wsize, MIN_LQ_WSIZE, MAX_LQ_WSIZE);
277 + olsr_exit(__func__, EXIT_FAILURE);
279 + olsr_cnf->lq_wsize = tmp_lq_wsize;
284 * Enable additional debugging information to be logged.
285 diff -Nur olsrd-0.4.10.orig/src/scheduler.c olsrd-0.4.10/src/scheduler.c
286 --- olsrd-0.4.10.orig/src/scheduler.c 2006-12-01 20:20:31.000000000 +0100
287 +++ olsrd-0.4.10/src/scheduler.c 2006-12-01 20:23:37.000000000 +0100
290 prev->next = entry->next;
296 diff -Nur olsrd-0.4.10.orig/src/win32/net.c olsrd-0.4.10/src/win32/net.c
297 --- olsrd-0.4.10.orig/src/win32/net.c 2005-05-30 15:50:27.000000000 +0200
298 +++ olsrd-0.4.10/src/win32/net.c 2006-12-01 20:23:37.000000000 +0100
301 fprintf(stderr, "Error connecting %d - %s\n", errno, strerror(errno));
302 printf("connection refused\n");