From (spam-protected) Wed Dec 14 11:45:36 2005 From: (spam-protected) (Thomas Lopatic) Date: Wed, 14 Dec 2005 10:45:36 +0000 Subject: [Olsr-cvs] olsrd-current README-Link-Quality-Fish-Eye.txt,NONE,1.1 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv593 Added Files: README-Link-Quality-Fish-Eye.txt Log Message: Added Elektra's Fish Eye documentation. --- NEW FILE: README-Link-Quality-Fish-Eye.txt --- +=====================================================================+ | Link Quality Fish Eye Mechanism December 3th 2005 | | | | olsrd-0.4.10 | +=====================================================================+ Corinna 'Elektra' Aichele (onelektra at gmx.net) --------------- I. Introduction --------------- Link Quality Fish Eye is a new (experimental) algorithm introduced in olsrd 0.4.10. To increase stability in a mesh, TC messages should be sent quite frequently. However, the network would then suffer from the resulting overhead. The idea is to frequently send TC messages to adjacent nodes, i.e. nodes that are likely to be involved in routing loops, without flooding the whole mesh with each sent TC message. OLSR packets carry a Time To Live (TTL) that specifies the maximal number of hops that the packets is allowed to travel in the mesh. The Link Quality Fish Eye mechanism generates TC messages not only with the default TTL of 255, but with different TTLs, namely 1, 2, 3, and 255, restricting the distribution of TC messages to nodes 1, 2, 3, and 255 hops away. A TC message with a TTL of 1 will just travel to all one-hop neighbours, a message with a TTL of 2 will in addition reach all two-hop neighbours, etc. TC messages with small TTLs are sent more frequently than TC messages with higher TTLs, such that immediate neighbours are more up to date with respect to our links than the rest of the mesh. We hope that this reduces the likelihood of routing loops. -------------- II. How to use -------------- The Fish Eye algorithm can be enabled in the configuration file /etc/olsrd.conf with the following lines: # Fish Eye mechanism for TC messages 0 = off, 1 = on LinkQualityFishEye 1 Fish Eye should be used together with a small TcInterval setting as follows: # TC interval in seconds (float) TcInterval 0.5 If olsrd is started with debug-level 3 it will print out a message every time a TC message is issued or dropped. The following sequence of TTL values is used by olsrd. 255 3 2 1 2 1 1 3 2 1 2 1 1 Hence, a TC interval of 0.5 seconds leads to the following TC broadcast scheme. * Out of 13 TC messages, all 13 are seen by one-hop neighbours (TTL 1, 2, 3, or 255), i.e. a one-hop neighbour sees a TC message every 0.5 seconds. * Two-hop neighbours (TTL 2, 3, or 255) see 7 out of 13 TC messages, i.e. about one message per 0.9 seconds. * Three-hop neighbours (TTL 3 or 255) see 3 out of 13 TC messages, i.e. about one message per 2.2 seconds. * All other nodes in the mesh (TTL 255) see 1 out of 13 TC messages, i.e. one message per 6.5 seconds. The sequence of TTL values is hardcoded in lq_packet.c and can be altered easily for further experiments. The Link Quality Fish Eye algorithm is compatible with earlier versions of olsrd or nodes that do not have the Fish Eye feature enabled. A default configuration file with the Link Quality Fish Eye mechanism and ETX enabled is located in ./files/olsrd.conf.default.lq-fisheye --------------- III. Background --------------- A major problem of a proactive routing algorithm is keeping topology control information in sync. If topology information is not in sync routing loops may occur. Usually routing loops happen in a local area in the mesh - within a few hops. It may happen that node A assumes that the best way to send packets to node C is by forwarding them to node B, while node B thinks that the best route to C is via node A. So A sends the packet to node B, and B returns it to A - we have a loop. This can of course also happen with more than two nodes involved in the loop, but it is unlikely that a routing loop involves more than a few nodes. Routing information like all data traffic gets lost on radio links with weak signal-to-noise ratio (SNR) or if collisions occur. Setting fragmentation and RTS (request-to-send) to conservative values on wireless interfaces is a must in a mesh to deal with hidden nodes, interference and collisions. A mesh that utilizes only one channel has to deal with many collisions between packets and a lot of self-generated interference. While a radio interface may have a range of only 300 meters its signals can disturb receivers that are more than 1000 meters away. The data traffic of a node in the distance is not readable, but it's signals add to the noise floor in receivers, reducing signal-to-noise ratio of local links. When a route is saturated with traffic the transmitters involved introduce permanent interference into the mesh, causing packet loss on other links in the neighbourhood. OLSR messages get lost, causing confusion. While the timeout values of MID messages or HNA messages can be increased to increase stability without a big tradeoff, TC messages that are up to date and arrive in time are critical. It is also critical to have MPR information in sync if the MPR algorithm is used, but in the author's opinion this optimization doesn't do any good anyway. The MPR algorithm introduces a new source of failure and reduces TC message redundancy, so it should be switched off in the configuration file /etc/olsrd.conf with these lines: TcRedundancy 2 MprCoverage 25 olsrd with LQ Extension attempts to know the best routes all over the whole mesh cloud, but it is likely that it never will be able to achieve this in a mesh that has more than a handful of nodes. TC information is likely to be lost on its way through the whole mesh. And this likelyhood increases with the number of hops. But this fact doesn't necessarily harm the routing of traffic on a long multihop path. A node at one end of a mesh cloud may have the illusion to know the exact and best path along which its packets travel when communicating with a node that is several hops away. But this information may be pretty outdated and incomplete. In fact all that the algorithm has to achieve is a reasonable choice for the next two or three hops. If the routing path is 8 hops, for example, nodes that are 5 hops away from the node initiating traffic and closer to the destination have better and more accurate information about the best path. They don't know what a node that initiates traffic thinks about the path that its packets should take, they have more accurate routing information and will look into their routing table and make a choice based on their knowledge. Someone that sends a snail mail parcel from Europe to India doesn't have to write the name of the Indian postman on the paket that is supposed to hand it over to the recipient or the brand of bicycle he is supposed to ride when transporting the parcel. He doesn't have to decide the path that the postman has to take in the recipient's village. The postman knows better than the sender. It should be sufficient if nodes have a vague idea about the topology of the mesh in the distance and who is out there. If only a few TC messages out of many TC packets that are broadcast make it over the whole mesh this should be sufficient. Have fun! Elektra From (spam-protected) Wed Dec 14 11:45:36 2005 From: (spam-protected) (Thomas Lopatic) Date: Wed, 14 Dec 2005 10:45:36 +0000 Subject: [Olsr-cvs] olsrd-current/files olsrd.conf.default.lq-fisheye, NONE, 1.1 Message-ID: Update of /cvsroot/olsrd/olsrd-current/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv593/files Added Files: olsrd.conf.default.lq-fisheye Log Message: Added Elektra's Fish Eye documentation. --- NEW FILE: olsrd.conf.default.lq-fisheye --- # # olsr.org OLSR daemon config file # # Lines starting with a # are discarded # # This file was shipped with olsrd 0.X.X # # This file is an example of a typical # configuration for a mostly static # network(regarding mobility) using # the LQ extention # Debug level(0-9) # If set to 0 the daemon runs in the background DebugLevel 2 # Fisheye mechanism for TC messages 0=off, 1=on LinkQualityFishEye 1 # IP version to use (4 or 6) IpVersion 4 # Clear the screen each time the internal state changes ClearScreen yes # HNA IPv4 routes # syntax: netaddr netmask # Example Internet gateway: # 0.0.0.0 0.0.0.0 Hna4 { # Internet gateway: # 0.0.0.0 0.0.0.0 # more entries can be added: # 192.168.1.0 255.255.255.0 } # HNA IPv6 routes # syntax: netaddr prefix # Example Internet gateway: Hna6 { # Internet gateway: # :: 0 # more entries can be added: # fec0:2200:106:: 48 } # Should olsrd keep on running even if there are # no interfaces available? This is a good idea # for a PCMCIA/USB hotswap environment. # "yes" OR "no" AllowNoInt yes # TOS(type of service) value for # the IP header of control traffic. # If not set it will default to 16 #TosValue 16 # The fixed willingness to use(0-7) # If not set willingness will be calculated # dynamically based on battery/power status # if such information is available #Willingness 4 # Allow processes like the GUI front-end # to connect to the daemon. IpcConnect { # Determines how many simultaneously # IPC connections that will be allowed # Setting this to 0 disables IPC MaxConnections 0 # By default only 127.0.0.1 is allowed # to connect. Here allowed hosts can # be added Host 127.0.0.1 #Host 10.0.0.5 # You can also specify entire net-ranges # that are allowed to connect. Multiple # entries are allowed #Net 192.168.1.0 255.255.255.0 } # Wether to use hysteresis or not # Hysteresis adds more robustness to the # link sensing but delays neighbor registration. # Used by default. 'yes' or 'no' # Do not use hysteresis with ETX! UseHysteresis no # Hysteresis parameters # Do not alter these unless you know # what you are doing! # Set to auto by default. Allowed # values are floating point values # in the interval 0,1 # THR_LOW must always be lower than # THR_HIGH. #HystScaling 0.50 #HystThrHigh 0.80 #HystThrLow 0.30 # Link quality level # 0 = do not use link quality # 1 = use link quality for MPR selection # 2 = use link quality for MPR selection and routing # Defaults to 0 LinkQualityLevel 2 # Link quality window size # Defaults to 10 LinkQualityWinSize 100 # Polling rate in seconds(float). # Default value 0.05 sec Pollrate 0.05 # TC redundancy # Specifies how much neighbor info should # be sent in TC messages # Possible values are: # 0 - only send MPR selectors # 1 - send MPR selectors and MPRs # 2 - send all neighbors # # defaults to 0 TcRedundancy 2 # # MPR coverage # Specifies how many MPRs a node should # try select to reach every 2 hop neighbor # # Can be set to any integer >0 # # defaults to 1 MprCoverage 5 # Olsrd plugins to load # This must be the absolute path to the file # or the loader will use the following scheme: # - Try the paths in the LD_LIBRARY_PATH # environment variable. # - The list of libraries cached in /etc/ld.so.cache # - /lib, followed by /usr/lib # Example plugin entry with parameters: #LoadPlugin "olsrd_dyn_gw.so.0.3" #{ # Here parameters are set to be sent to the # plugin. Theese are on the form "key" "value". # Parameters ofcause, differs from plugin to plugin. # Consult the documentation of your plugin for details. # Example: dyn_gw params # how often to check for Internet connectivity # defaults to 5 secs # PlParam "Interval" "40" # if one or more IPv4 addresses are given, do a ping on these in # descending order to validate that there is not only an entry in # routing table, but also a real internet connection. If any of # these addresses could be pinged successfully, the test was # succesful, i.e. if the ping on the 1st address was successful,the # 2nd won't be pinged # PlParam "Ping" "141.1.1.1" # PlParam "Ping" "194.25.2.129" #} # Interfaces and their rules # Omitted options will be set to the # default values. Multiple interfaces # can be specified in the same block # and multiple blocks can be set. # !!CHANGE THE INTERFACE LABEL(s) TO MATCH YOUR INTERFACE(s)!! # (eg. wlan0 or eth1): Interface "XXX" "YYY" { # IPv4 broadcast address to use. The # one usefull example would be 255.255.255.255 # If not defined the broadcastaddress # every card is configured with is used # Ip4Broadcast 255.255.255.255 # IPv6 address scope to use. # Must be 'site-local' or 'global' # Ip6AddrType site-local # IPv6 multicast address to use when # using site-local addresses. # If not defined, ff05::15 is used # Ip6MulticastSite ff05::11 # IPv6 multicast address to use when # using global addresses # If not defined, ff0e::1 is used # Ip6MulticastGlobal ff0e::1 # Emission intervals. # If not defined, RFC proposed values will # be used in most cases. # Hello interval in seconds(float) HelloInterval 5.0 # HELLO validity time HelloValidityTime 200.0 # TC interval in seconds(float) TcInterval 0.5 # TC validity time TcValidityTime 50.0 # MID interval in seconds(float) MidInterval 5.0 # MID validity time MidValidityTime 100.0 # HNA interval in seconds(float) HnaInterval 5.0 # HNA validity time HnaValidityTime 100.0 # When multiple links exist between hosts # the weight of interface is used to determine # the link to use. Normally the weight is # automatically calculated by olsrd based # on the characteristics of the interface, # but here you can specify a fixed value. # Olsrd will choose links with the lowest value. # Weight 0 # If a certain route should be preferred # or ignored by the mesh, the Link Quality # value of a node can be multiplied with a factor # entered here. In the example the route # using 192.168.0.1 would rather be ignored. # A multiplier of 0.5 will result in a small # (bad) LinkQuality value and a high (bad) # ETX value. # LinkQualityMult 192.168.0.1 0.5 # This multiplier applies to all other nodes # LinkQualityMult default 0.8 } From (spam-protected) Fri Dec 16 09:22:01 2005 From: (spam-protected) (Andreas Tønnesen) Date: Fri, 16 Dec 2005 08:22:01 +0000 Subject: [Olsr-cvs] olsrd-current/src mpr_selector_set.c, 1.13, 1.14 mpr_selector_set.h, 1.12, 1.13 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7689 Modified Files: mpr_selector_set.c mpr_selector_set.h Log Message: Added olsr_is_mpr function. Should have no impact on regular operation Index: mpr_selector_set.h =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/mpr_selector_set.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mpr_selector_set.h 29 May 2005 12:47:45 -0000 1.12 --- mpr_selector_set.h 16 Dec 2005 08:21:59 -0000 1.13 *************** *** 54,57 **** --- 54,60 ---- + olsr_bool + olsr_is_mpr(void); + olsr_u16_t get_local_ansn(void); Index: mpr_selector_set.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/mpr_selector_set.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mpr_selector_set.c 27 Feb 2005 10:43:38 -0000 1.13 --- mpr_selector_set.c 16 Dec 2005 08:21:59 -0000 1.14 *************** *** 85,88 **** --- 85,98 ---- /** + * Check if we(this node) is selected as a MPR by any + * neighbors. If the list is empty we are not MPR. + */ + olsr_bool + olsr_is_mpr() + { + return ((mprs_list.next == &mprs_list) ? OLSR_FALSE : OLSR_TRUE); + } + + /** *Add a MPR selector to the MPR selector set * From (spam-protected) Fri Dec 16 16:16:44 2005 From: (spam-protected) (Andreas Tønnesen) Date: Fri, 16 Dec 2005 15:16:44 +0000 Subject: [Olsr-cvs] olsrd-current/lib/httpinfo/src olsrd_httpinfo.c, 1.54, 1.55 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/httpinfo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23717/src Modified Files: olsrd_httpinfo.c Log Message: Added patch from Sven-Ola Index: olsrd_httpinfo.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_httpinfo.c,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** olsrd_httpinfo.c 10 Nov 2005 19:28:02 -0000 1.54 --- olsrd_httpinfo.c 16 Dec 2005 15:16:42 -0000 1.55 *************** *** 47,50 **** --- 47,51 ---- #include #include + #include #include #include *************** *** 189,192 **** --- 190,198 ---- static int http_socket; + int netsprintf(char *str, const char* format, ...); + static int netsprintf_direct = 0; + static int netsprintf_error = 0; + #define sprintf netsprintf + #define NETDIRECT *************** *** 466,469 **** --- 472,480 ---- if(tab_entries[i].filename) { + #ifdef NETDIRECT + netsprintf_error = 0; + netsprintf_direct = 1; + c = build_http_header(HTTP_OK, OLSR_TRUE, size, req, MAX_HTTPREQ_SIZE); + #endif y = 0; while(http_ok_head[y]) *************** *** 490,496 **** --- 501,512 ---- } + #ifdef NETDIRECT + netsprintf_direct = 1; + goto close_connection; + #else c = build_http_header(HTTP_OK, OLSR_TRUE, size, req, MAX_HTTPREQ_SIZE); goto send_http_data; + #endif } *************** *** 581,585 **** if(size > 0) { ! sprintf(tmp, "Content-length: %i\r\n", size); strcat(buf, tmp); } --- 597,601 ---- if(size > 0) { ! snprintf(tmp, sizeof(tmp), "Content-length: %i\r\n", size); strcat(buf, tmp); } *************** *** 1235,1239 **** { /* IPv6 */ ! sprintf(netmask, "%d", mask->v6); return netmask; } --- 1251,1255 ---- { /* IPv6 */ ! snprintf(netmask, sizeof(netmask), "%d", mask->v6); return netmask; } *************** *** 1250,1251 **** --- 1266,1293 ---- return copyright_string; } + + /* + * In a bigger mesh, there are probs with the fixed + * bufsize. Because the Content-Length header is + * optional, the sprintf() is changed to a more + * scalable solution here. + */ + + int netsprintf(char *str, const char* format, ...) + { + va_list arg; + int rv; + va_start(arg, format); + rv = vsprintf(str, format, arg); + va_end(arg); + if (0 != netsprintf_direct) { + if (0 == netsprintf_error) { + if (0 > send(client_sockets[curr_clients], str, rv, 0)) { + olsr_printf(1, "(HTTPINFO) Failed sending data to client!\n"); + netsprintf_error = 1; + } + } + return 0; + } + return rv; + } From (spam-protected) Sat Dec 17 08:30:36 2005 From: (spam-protected) (Andreas Tønnesen) Date: Sat, 17 Dec 2005 07:30:36 +0000 Subject: [Olsr-cvs] olsrd-current README-Link-Quality-Fish-Eye.txt,1.1,1.2 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3791 Modified Files: README-Link-Quality-Fish-Eye.txt Log Message: Fixed from elektra Index: README-Link-Quality-Fish-Eye.txt =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/README-Link-Quality-Fish-Eye.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README-Link-Quality-Fish-Eye.txt 14 Dec 2005 10:45:33 -0000 1.1 --- README-Link-Quality-Fish-Eye.txt 17 Dec 2005 07:30:34 -0000 1.2 *************** *** 124,128 **** TcRedundancy 2 ! MprCoverage 25 olsrd with LQ Extension attempts to know the best routes all over the --- 124,128 ---- TcRedundancy 2 ! MprCoverage 7 olsrd with LQ Extension attempts to know the best routes all over the From (spam-protected) Sat Dec 17 08:30:37 2005 From: (spam-protected) (Andreas Tønnesen) Date: Sat, 17 Dec 2005 07:30:37 +0000 Subject: [Olsr-cvs] olsrd-current/files olsrd.conf.default.lq-fisheye, 1.1, 1.2 Message-ID: Update of /cvsroot/olsrd/olsrd-current/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3791/files Modified Files: olsrd.conf.default.lq-fisheye Log Message: Fixed from elektra Index: olsrd.conf.default.lq-fisheye =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.default.lq-fisheye,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** olsrd.conf.default.lq-fisheye 14 Dec 2005 10:45:34 -0000 1.1 --- olsrd.conf.default.lq-fisheye 17 Dec 2005 07:30:34 -0000 1.2 *************** *** 254,258 **** # TC validity time ! TcValidityTime 50.0 # MID interval in seconds(float) --- 254,258 ---- # TC validity time ! TcValidityTime 250.0 # MID interval in seconds(float) From (spam-protected) Sat Dec 17 18:22:28 2005 From: (spam-protected) (Andreas Tønnesen) Date: Sat, 17 Dec 2005 17:22:28 +0000 Subject: [Olsr-cvs] olsrd-current/lib/httpinfo/src olsrd_httpinfo.c, 1.55, 1.56 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/httpinfo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26136/src Modified Files: olsrd_httpinfo.c Log Message: Patch from sven-ola Index: olsrd_httpinfo.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_httpinfo.c,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** olsrd_httpinfo.c 16 Dec 2005 15:16:42 -0000 1.55 --- olsrd_httpinfo.c 17 Dec 2005 17:22:26 -0000 1.56 *************** *** 473,479 **** { #ifdef NETDIRECT netsprintf_error = 0; netsprintf_direct = 1; - c = build_http_header(HTTP_OK, OLSR_TRUE, size, req, MAX_HTTPREQ_SIZE); #endif y = 0; --- 473,485 ---- { #ifdef NETDIRECT + c = build_http_header(HTTP_OK, OLSR_TRUE, size, req, MAX_HTTPREQ_SIZE); + r = send(client_sockets[curr_clients], req, c, 0); + if(r < 0) + { + olsr_printf(1, "(HTTPINFO) Failed sending data to client!\n"); + goto close_connection; + } netsprintf_error = 0; netsprintf_direct = 1; #endif y = 0; From (spam-protected) Wed Dec 21 15:19:03 2005 From: (spam-protected) (Andreas Tønnesen) Date: Wed, 21 Dec 2005 14:19:03 +0000 Subject: [Olsr-cvs] olsrd-current/files olsrd.8.gz,1.5,1.6 Message-ID: Update of /cvsroot/olsrd/olsrd-current/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7682 Modified Files: olsrd.8.gz Log Message: Added new hemu option to manpage Index: olsrd.8.gz =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.8.gz,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsjEmWFb and /tmp/cvspZetYH differ From (spam-protected) Wed Dec 21 15:23:45 2005 From: (spam-protected) (Andreas Tønnesen) Date: Wed, 21 Dec 2005 14:23:45 +0000 Subject: [Olsr-cvs] olsrd-current/files olsrd.conf.5.gz,1.6,1.7 Message-ID: Update of /cvsroot/olsrd/olsrd-current/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9082 Modified Files: olsrd.conf.5.gz Log Message: Added fisheye option to olsrd.conf manpage Index: olsrd.conf.5.gz =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.5.gz,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsn8vm1C and /tmp/cvsl1SGV1 differ From (spam-protected) Wed Dec 21 15:58:09 2005 From: (spam-protected) (Andreas Tønnesen) Date: Wed, 21 Dec 2005 14:58:09 +0000 Subject: [Olsr-cvs] olsrd-current CHANGELOG,1.53,1.54 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15974 Modified Files: CHANGELOG Log Message: Added comment on fish eye algorithm Index: CHANGELOG =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/CHANGELOG,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** CHANGELOG 29 Nov 2005 19:09:59 -0000 1.53 --- CHANGELOG 21 Dec 2005 14:58:06 -0000 1.54 *************** *** 14,17 **** --- 14,22 ---- the readme file. + EXPERIMENTAL FISH EYE ALGORITHM + + An experimental algorithm for TTL settings on TC messages has + been added. Read more in the corresponding README file. + OPENBSD SUPPORT *************** *** 55,64 **** --- 60,76 ---- - Fixed crash when changing IPv6 address at run-time - Fixed a bug that prevented setting willingness 0 in the configfile + <<<<<<< CHANGELOG + - Fixed bad handling of missing command line arguments + ======= - Did various updates to prevent assertion when a neighbor has changed IP and sends HELLO before its olsrd precess has detected the change. + <<<<<<< CHANGELOG + >>>>>>> 1.47 + ======= - Fixed return value check on times(2) calls in the scheduler - Fixed bug(s) that could cause crash when an interface was brought down while olsrd was running. + >>>>>>> 1.53 0.4.9 --------------------------------------------------------------------- From (spam-protected) Thu Dec 22 16:06:54 2005 From: (spam-protected) (Andreas Tønnesen) Date: Thu, 22 Dec 2005 15:06:54 +0000 Subject: [Olsr-cvs] olsrd-current/lib/httpinfo/src olsrd_httpinfo.c, 1.56, 1.57 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/httpinfo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32540/lib/httpinfo/src Modified Files: olsrd_httpinfo.c Log Message: Patches from Sven-Ola Index: olsrd_httpinfo.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_httpinfo.c,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** olsrd_httpinfo.c 17 Dec 2005 17:22:26 -0000 1.56 --- olsrd_httpinfo.c 22 Dec 2005 15:06:52 -0000 1.57 *************** *** 809,812 **** --- 809,814 ---- size += sprintf(&buf[size], "\n\n"); + size += sprintf(&buf[size], "Fisheye: %s\n", olsr_cnf->lq_fish ? "Enabled" : "Disabled"); + size += sprintf(&buf[size], "TOS: 0x%04x\n", olsr_cnf->tos); From (spam-protected) Thu Dec 22 16:06:55 2005 From: (spam-protected) (Andreas Tønnesen) Date: Thu, 22 Dec 2005 15:06:55 +0000 Subject: [Olsr-cvs] olsrd-current/src net_olsr.c,1.5,1.6 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32540/src Modified Files: net_olsr.c Log Message: Patches from Sven-Ola Index: net_olsr.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/net_olsr.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** net_olsr.c 23 Oct 2005 20:58:14 -0000 1.5 --- net_olsr.c 22 Dec 2005 15:06:52 -0000 1.6 *************** *** 152,156 **** new_buf->bufsize = ifp->int_mtu; new_buf->if_index = ifp->if_nr; ! new_buf->maxsize = ifp->int_mtu - OLSR_HEADERSIZE; new_buf->pending = 0; new_buf->reserved = 0; --- 152,157 ---- new_buf->bufsize = ifp->int_mtu; new_buf->if_index = ifp->if_nr; ! new_buf->maxsize = ifp->int_mtu - OLSR_HEADERSIZE - (olsr_cnf->ip_version == AF_INET ? 28 : 0); ! new_buf->pending = 0; new_buf->reserved = 0; From (spam-protected) Thu Dec 29 19:37:18 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 18:37:18 +0000 Subject: [Olsr-cvs] olsrd-current/src net_olsr.c,1.6,1.7 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv556/src Modified Files: net_olsr.c Log Message: Subtract IP and UDP header sizes from the right struct field. Index: net_olsr.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/net_olsr.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** net_olsr.c 22 Dec 2005 15:06:52 -0000 1.6 --- net_olsr.c 29 Dec 2005 18:37:16 -0000 1.7 *************** *** 152,156 **** new_buf->bufsize = ifp->int_mtu; new_buf->if_index = ifp->if_nr; ! new_buf->maxsize = ifp->int_mtu - OLSR_HEADERSIZE - (olsr_cnf->ip_version == AF_INET ? 28 : 0); new_buf->pending = 0; --- 152,156 ---- new_buf->bufsize = ifp->int_mtu; new_buf->if_index = ifp->if_nr; ! new_buf->maxsize = ifp->int_mtu - OLSR_HEADERSIZE; new_buf->pending = 0; From (spam-protected) Thu Dec 29 19:37:18 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 18:37:18 +0000 Subject: [Olsr-cvs] olsrd-current/src/unix ifnet.c,1.30,1.31 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv556/src/unix Modified Files: ifnet.c Log Message: Subtract IP and UDP header sizes from the right struct field. Index: ifnet.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ifnet.c 8 Oct 2005 15:38:38 -0000 1.30 --- ifnet.c 29 Dec 2005 18:37:16 -0000 1.31 *************** *** 224,228 **** else { ! ifp->int_mtu -= (olsr_cnf->ip_version == AF_INET6) ? UDP_IPV6_HDRSIZE : UDP_IPV4_HDRSIZE; if(ifp->int_mtu != ifr.ifr_mtu) { --- 224,229 ---- else { ! ifr.ifr_mtu -= (olsr_cnf->ip_version == AF_INET6) ? UDP_IPV6_HDRSIZE : UDP_IPV4_HDRSIZE; ! if(ifp->int_mtu != ifr.ifr_mtu) { From (spam-protected) Thu Dec 29 20:48:45 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 19:48:45 +0000 Subject: [Olsr-cvs] olsrd-current/lib/pgraph/src olsrd_pgraph.c,1.1,1.2 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/pgraph/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16627/lib/pgraph/src Modified Files: olsrd_pgraph.c Log Message: Reanimated OS X port. Any OS X dynamic linking experts? Just tried a couple of options from the ld man page that seemed plausible. Looks okay, but should be verified by somebody that knows what he's doing. Index: olsrd_pgraph.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/pgraph/src/olsrd_pgraph.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** olsrd_pgraph.c 13 Jul 2005 21:45:08 -0000 1.1 --- olsrd_pgraph.c 29 Dec 2005 19:48:43 -0000 1.2 *************** *** 393,397 **** return 0; ! #ifdef __FreeBSD__ if (send(ipc_connection, data, size, 0) < 0) #else --- 393,397 ---- return 0; ! #if defined __FreeBSD__ || defined __MacOSX__ if (send(ipc_connection, data, size, 0) < 0) #else From (spam-protected) Thu Dec 29 20:48:45 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 19:48:45 +0000 Subject: [Olsr-cvs] olsrd-current/lib/tas Makefile,1.3,1.4 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/tas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16627/lib/tas Modified Files: Makefile Log Message: Reanimated OS X port. Any OS X dynamic linking experts? Just tried a couple of options from the ld man page that seemed plausible. Looks okay, but should be verified by somebody that knows what he's doing. Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/tas/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 25 May 2005 15:05:34 -0000 1.3 --- Makefile 29 Dec 2005 19:48:43 -0000 1.4 *************** *** 52,59 **** endif ! ifeq ($(OS),fbsd) default_target install clean: ! @echo "*** TAS Plugin not supported on FreeBSD yet, sorry!" else --- 52,59 ---- endif ! ifneq ($(OS),linux) default_target install clean: ! @echo "*** TAS Plugin only supported on Linux, sorry!" else From (spam-protected) Thu Dec 29 20:48:46 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 19:48:46 +0000 Subject: [Olsr-cvs] olsrd-current/lib/dot_draw/src olsrd_dot_draw.c, 1.18, 1.19 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/dot_draw/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16627/lib/dot_draw/src Modified Files: olsrd_dot_draw.c Log Message: Reanimated OS X port. Any OS X dynamic linking experts? Just tried a couple of options from the ld man page that seemed plausible. Looks okay, but should be verified by somebody that knows what he's doing. Index: olsrd_dot_draw.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/dot_draw/src/olsrd_dot_draw.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** olsrd_dot_draw.c 8 Nov 2005 11:24:04 -0000 1.18 --- olsrd_dot_draw.c 29 Dec 2005 19:48:43 -0000 1.19 *************** *** 206,210 **** } ! #ifdef __FreeBSD__ if (setsockopt(ipc_socket, SOL_SOCKET, SO_NOSIGPIPE, (char *)&yes, sizeof(yes)) < 0) { --- 206,210 ---- } ! #if defined __FreeBSD__ if (setsockopt(ipc_socket, SOL_SOCKET, SO_NOSIGPIPE, (char *)&yes, sizeof(yes)) < 0) { *************** *** 450,454 **** return 0; ! #if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ if (send(ipc_connection, data, size, 0) < 0) #else --- 450,454 ---- return 0; ! #if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __MacOSX__ if (send(ipc_connection, data, size, 0) < 0) #else From (spam-protected) Thu Dec 29 20:48:45 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 19:48:45 +0000 Subject: [Olsr-cvs] olsrd-current/lib/powerinfo/src olsrd_power.c,1.13,1.14 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/powerinfo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16627/lib/powerinfo/src Modified Files: olsrd_power.c Log Message: Reanimated OS X port. Any OS X dynamic linking experts? Just tried a couple of options from the ld man page that seemed plausible. Looks okay, but should be verified by somebody that knows what he's doing. Index: olsrd_power.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/powerinfo/src/olsrd_power.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** olsrd_power.c 29 May 2005 12:47:43 -0000 1.13 --- olsrd_power.c 29 Dec 2005 19:48:43 -0000 1.14 *************** *** 545,549 **** return 0; ! #if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ if (send(ipc_connection, data, size, 0) < 0) #else --- 545,549 ---- return 0; ! #if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __MacOSX__ if (send(ipc_connection, data, size, 0) < 0) #else From (spam-protected) Thu Dec 29 20:48:45 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 19:48:45 +0000 Subject: [Olsr-cvs] olsrd-current/src/cfgparser Makefile,1.20,1.21 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/cfgparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16627/src/cfgparser Modified Files: Makefile Log Message: Reanimated OS X port. Any OS X dynamic linking experts? Just tried a couple of options from the ld man page that seemed plausible. Looks okay, but should be verified by somebody that knows what he's doing. Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile 2 Jun 2005 14:41:59 -0000 1.20 --- Makefile 29 Dec 2005 19:48:43 -0000 1.21 *************** *** 68,72 **** --- 68,78 ---- # build lib per default + + ifeq (${OS}, osx) + LDFLAGS += -dynamiclib -single_module + else LDFLAGS += -shared -Wl,-soname,$(LIBNAME) + endif + CFLAGS += -DMAKELIB NAME = $(LIBNAME) From (spam-protected) Thu Dec 29 20:48:45 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 19:48:45 +0000 Subject: [Olsr-cvs] olsrd-current/make Makefile.osx, 1.3, 1.4 guess_os.sh, 1.1, 1.2 Message-ID: Update of /cvsroot/olsrd/olsrd-current/make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16627/make Modified Files: Makefile.osx guess_os.sh Log Message: Reanimated OS X port. Any OS X dynamic linking experts? Just tried a couple of options from the ld man page that seemed plausible. Looks okay, but should be verified by somebody that knows what he's doing. Index: guess_os.sh =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/guess_os.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** guess_os.sh 25 May 2005 13:50:22 -0000 1.1 --- guess_os.sh 29 Dec 2005 19:48:43 -0000 1.2 *************** *** 18,22 **** netbsd*) arch=nbsd ;; openbsd*) arch=obsd ;; ! osx*) arch=osx ;; cygwin_*) arch=win32 ;; Windows_*) arch=win32 ;; --- 18,22 ---- netbsd*) arch=nbsd ;; openbsd*) arch=obsd ;; ! darwin*) arch=osx ;; cygwin_*) arch=win32 ;; Windows_*) arch=win32 ;; Index: Makefile.osx =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.osx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.osx 2 Jun 2005 14:41:59 -0000 1.3 --- Makefile.osx 29 Dec 2005 19:48:43 -0000 1.4 *************** *** 18,22 **** ifdef OLSRD_PLUGIN CFLAGS += -fPIC ! LDFLAGS += -fPIC endif --- 18,24 ---- ifdef OLSRD_PLUGIN CFLAGS += -fPIC ! LDFLAGS = -fPIC -dynamiclib -single_module -flat_namespace -undefined suppress ! else ! LDFLAGS = -dynamic endif From (spam-protected) Thu Dec 29 22:26:33 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 21:26:33 +0000 Subject: [Olsr-cvs] olsrd-current/gui/win32 Frontend.ncb, 1.20, 1.21 Frontend.opt, 1.20, 1.21 Message-ID: Update of /cvsroot/olsrd/olsrd-current/gui/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1624/gui/win32 Modified Files: Frontend.ncb Frontend.opt Log Message: Added olsr_switch.exe and new READMEs to Windows distribution. Index: Frontend.opt =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/gui/win32/Frontend.opt,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 Binary files /tmp/cvsZbaCM2 and /tmp/cvsCCY19U differ Index: Frontend.ncb =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/gui/win32/Frontend.ncb,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 Binary files /tmp/cvsAkHqp5 and /tmp/cvsZcotUX differ From (spam-protected) Thu Dec 29 22:26:33 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 21:26:33 +0000 Subject: [Olsr-cvs] olsrd-current/gui/win32/Inst installer.nsi,1.13,1.14 Message-ID: Update of /cvsroot/olsrd/olsrd-current/gui/win32/Inst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1624/gui/win32/Inst Modified Files: installer.nsi Log Message: Added olsr_switch.exe and new READMEs to Windows distribution. Index: installer.nsi =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/gui/win32/Inst/installer.nsi,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** installer.nsi 31 Mar 2005 18:20:02 -0000 1.13 --- installer.nsi 29 Dec 2005 21:26:31 -0000 1.14 *************** *** 56,60 **** Function .onInit ! MessageBox MB_YESNO "This will install olsr.org 0.4.9 on your computer. Continue?" IDYES NoAbort Abort NoAbort: --- 56,60 ---- Function .onInit ! MessageBox MB_YESNO "This will install olsr.org 0.4.10 on your computer. Continue?" IDYES NoAbort Abort NoAbort: *************** *** 73,79 **** --- 73,82 ---- File ..\Shim\Release\Shim.exe File ..\..\..\olsrd.exe + File ..\..\..\olsr_switch.exe File ..\..\..\src\cfgparser\olsrd_cfgparser.dll File /oname=README.txt ..\..\..\README File /oname=README-LQ.html ..\..\..\README-Link-Quality.html + File /oname=README-Fish-Eye.txt ..\..\..\README-Link-Quality-Fish-Eye.txt + File ..\..\..\README-Olsr-Switch.html File linux-manual.txt File /oname=olsrd.conf.rfc ..\..\..\files\olsrd.conf.win32.rfc *************** *** 158,164 **** --- 161,170 ---- Delete $INSTDIR\Shim.exe Delete $INSTDIR\olsrd.exe + Delete $INSTDIR\olsr_switch.exe Delete $INSTDIR\olsrd_cfgparser.dll Delete $INSTDIR\README.txt Delete $INSTDIR\README-LQ.html + Delete $INSTDIR\README-Fish-Eye.txt + Delete $INSTDIR\README-Olsr-Switch.html Delete $INSTDIR\linux-manual.txt Delete $INSTDIR\Default.olsr From (spam-protected) Thu Dec 29 22:26:33 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 21:26:33 +0000 Subject: [Olsr-cvs] olsrd-current/make Makefile.win32,1.3,1.4 Message-ID: Update of /cvsroot/olsrd/olsrd-current/make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1624/make Modified Files: Makefile.win32 Log Message: Added olsr_switch.exe and new READMEs to Windows distribution. Index: Makefile.win32 =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.win32,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.win32 2 Jun 2005 14:41:59 -0000 1.3 --- Makefile.win32 29 Dec 2005 21:26:31 -0000 1.4 *************** *** 29,35 **** --- 29,38 ---- gui/win32/Shim/Release/Shim.exe \ olsrd.exe \ + olsr_switch.exe \ src/cfgparser/olsrd_cfgparser.dll \ README \ README-Link-Quality.html \ + README-Link-Quality-Fish-Eye.txt \ + README-Olsr-Switch.html \ gui/win32/Inst/linux-manual.txt \ files/olsrd.conf.win32.rfc \ *************** *** 41,44 **** --- 44,48 ---- lib/httpinfo/olsrd_httpinfo.dll $(STRIP) olsrd.exe + $(STRIP) olsr_switch.exe $(STRIP) src/cfgparser/olsrd_cfgparser.dll $(STRIP) lib/dot_draw/olsrd_dot_draw.dll *************** *** 52,58 **** --- 56,65 ---- cp gui/win32/Shim/Release/Shim.exe $(TEMP)/olsr-$(VERS) cp olsrd.exe $(TEMP)/olsr-$(VERS) + cp olsr_switch.exe $(TEMP)/olsr-$(VERS) cp src/cfgparser/olsrd_cfgparser.dll $(TEMP)/olsr-$(VERS) cp README $(TEMP)/olsr-$(VERS) cp README-Link-Quality.html $(TEMP)/olsr-$(VERS) + cp README-Link-Quality-Fish-Eye.txt $(TEMP)/olsr-$(VERS) + cp README-Olsr-Switch.html $(TEMP)/olsr-$(VERS) cp gui/win32/Inst/linux-manual.txt $(TEMP)/olsr-$(VERS) cp files/olsrd.conf.win32.rfc $(TEMP)/olsr-$(VERS)/olsrd.conf.rfc *************** *** 72,78 **** --- 79,88 ---- gui/win32/Shim/Release/Shim.exe \ olsrd.exe \ + olsr_switch.exe \ src/cfgparser/olsrd_cfgparser.dll \ README \ README-Link-Quality.html \ + README-Link-Quality-Fish-Eye.txt \ + README-Olsr-Switch.html \ gui/win32/Inst/linux-manual.txt \ files/olsrd.conf.win32.rfc \ *************** *** 85,88 **** --- 95,99 ---- gui/win32/Inst/installer.nsi $(STRIP) olsrd.exe + $(STRIP) olsr_switch.exe $(STRIP) src/cfgparser/olsrd_cfgparser.dll $(STRIP) lib/dot_draw/olsrd_dot_draw.dll From (spam-protected) Thu Dec 29 22:26:33 2005 From: (spam-protected) (Thomas Lopatic) Date: Thu, 29 Dec 2005 21:26:33 +0000 Subject: [Olsr-cvs] olsrd-current Makefile,1.66,1.67 Message-ID: Update of /cvsroot/olsrd/olsrd-current In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1624 Modified Files: Makefile Log Message: Added olsr_switch.exe and new READMEs to Windows distribution. Index: Makefile =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** Makefile 21 Nov 2005 06:27:29 -0000 1.66 --- Makefile 29 Dec 2005 21:26:31 -0000 1.67 *************** *** 38,41 **** --- 38,43 ---- # $Id$ + VERS = 0.4.10pre + TOPDIR = . include Makefile.inc *************** *** 47,52 **** endif - VERS = 0.4.10pre - SWITCHDIR = src/olsr_switch CFGDIR = src/cfgparser --- 49,52 ---- From (spam-protected) Thu Dec 29 23:34:39 2005 From: (spam-protected) (Andreas Tønnesen) Date: Thu, 29 Dec 2005 22:34:39 +0000 Subject: [Olsr-cvs] olsrd-current/src scheduler.c,1.32,1.33 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14725 Modified Files: scheduler.c Log Message: Removed return value check on times(2) calls... hey, Im working in a win98 box - w00t Index: scheduler.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/scheduler.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** scheduler.c 17 Nov 2005 04:25:44 -0000 1.32 --- scheduler.c 29 Dec 2005 22:34:37 -0000 1.33 *************** *** 125,137 **** /* Update now_times */ ! if((now_times = times(&tms_buf)) == -1) ! { ! if((now_times = times(&tms_buf)) == -1) ! { ! fprintf(stderr, "Fatal!scheduler could not get new_times.\n%s\n", strerror(errno)); ! olsr_syslog(OLSR_LOG_ERR, "Fatal!scheduler could not get new_times.\n%m\n"); ! olsr_exit(__func__, EXIT_FAILURE); ! } ! } /* Update the global timestamp - kept for plugin compat */ --- 125,129 ---- /* Update now_times */ ! now_times = times(&tms_buf); /* Update the global timestamp - kept for plugin compat */ *************** *** 211,223 **** ! if((end_of_loop = times(&tms_buf)) < 0) ! { ! if((end_of_loop = times(&tms_buf)) < 0) ! { ! fprintf(stderr, "Fatal!scheduler could not get new_times.\n%s\n", strerror(errno)); ! olsr_syslog(OLSR_LOG_ERR, "Fatal!scheduler could not get new_times.\n%m\n"); ! olsr_exit(__func__, EXIT_FAILURE); ! } ! } //printf("Tick diff: %d\n", end_of_loop - now_times); --- 203,207 ---- ! end_of_loop = times(&tms_buf); //printf("Tick diff: %d\n", end_of_loop - now_times); From (spam-protected) Fri Dec 30 03:24:02 2005 From: (spam-protected) (Thomas Lopatic) Date: Fri, 30 Dec 2005 02:24:02 +0000 Subject: [Olsr-cvs] olsrd-current/src/cfgparser cfgfile_gen.c,1.1,1.2 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/cfgparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26275/src/cfgparser Modified Files: cfgfile_gen.c Log Message: Fixed build on FreeBSD 4.8. Index: cfgfile_gen.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/cfgfile_gen.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cfgfile_gen.c 14 Mar 2005 21:24:22 -0000 1.1 --- cfgfile_gen.c 30 Dec 2005 02:24:00 -0000 1.2 *************** *** 44,47 **** --- 44,48 ---- #include #include + #include #include #include From (spam-protected) Fri Dec 30 03:24:02 2005 From: (spam-protected) (Thomas Lopatic) Date: Fri, 30 Dec 2005 02:24:02 +0000 Subject: [Olsr-cvs] olsrd-current/lib/dot_draw/src olsrd_dot_draw.c, 1.19, 1.20 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/dot_draw/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26275/lib/dot_draw/src Modified Files: olsrd_dot_draw.c Log Message: Fixed build on FreeBSD 4.8. Index: olsrd_dot_draw.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/dot_draw/src/olsrd_dot_draw.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** olsrd_dot_draw.c 29 Dec 2005 19:48:43 -0000 1.19 --- olsrd_dot_draw.c 30 Dec 2005 02:23:59 -0000 1.20 *************** *** 206,210 **** } ! #if defined __FreeBSD__ if (setsockopt(ipc_socket, SOL_SOCKET, SO_NOSIGPIPE, (char *)&yes, sizeof(yes)) < 0) { --- 206,210 ---- } ! #if defined __FreeBSD__ && defined SO_NOSIGPIPE if (setsockopt(ipc_socket, SOL_SOCKET, SO_NOSIGPIPE, (char *)&yes, sizeof(yes)) < 0) { From (spam-protected) Fri Dec 30 03:24:02 2005 From: (spam-protected) (Thomas Lopatic) Date: Fri, 30 Dec 2005 02:24:02 +0000 Subject: [Olsr-cvs] olsrd-current/lib/powerinfo/src olsrd_power.c,1.14,1.15 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/powerinfo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26275/lib/powerinfo/src Modified Files: olsrd_power.c Log Message: Fixed build on FreeBSD 4.8. Index: olsrd_power.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/powerinfo/src/olsrd_power.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** olsrd_power.c 29 Dec 2005 19:48:43 -0000 1.14 --- olsrd_power.c 30 Dec 2005 02:24:00 -0000 1.15 *************** *** 159,163 **** } ! #ifdef __FreeBSD__ if (setsockopt(ipc_socket, SOL_SOCKET, SO_NOSIGPIPE, (char *)&yes, sizeof(yes)) < 0) { --- 159,163 ---- } ! #if defined __FreeBSD__ && defined SO_NOSIGPIPE if (setsockopt(ipc_socket, SOL_SOCKET, SO_NOSIGPIPE, (char *)&yes, sizeof(yes)) < 0) {