Changeset 21585


Ignore:
Timestamp:
2010-05-27T23:43:30+02:00 (7 years ago)
Author:
acinonyx
Message:

[pacakges] olsrd: Update to v0.6.0

Location:
packages/net/olsrd
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/olsrd/Makefile

    r19705 r21585  
    11#  
    2 # Copyright (C) 2009 OpenWrt.org 
     2# Copyright (C) 2009-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=olsrd 
    11 PKG_VERSION:=0.5.6-r8 
     11PKG_VERSION:=0.6.0 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    15 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5 
    16 PKG_MD5SUM:=aef6f4350c44fd0ad015a26621ef9607 
     15PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6 
     16PKG_MD5SUM:=8425a10e315be5e061143ac310f2424b 
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
  • packages/net/olsrd/files/olsrd.config

    r13562 r21585  
    99 
    1010config LoadPlugin 
    11         option library 'olsrd_dyn_gw.so.0.4' 
     11        option library 'olsrd_dyn_gw.so.0.5' 
    1212 
    1313config LoadPlugin 
  • packages/net/olsrd/patches/100-no_forwarding_override.patch

    r19192 r21585  
    11--- a/src/linux/net.c 
    22+++ b/src/linux/net.c 
    3 @@ -115,6 +115,7 @@ 
    4  int 
    5  enable_ip_forwarding(int version) 
    6  { 
     3@@ -171,11 +171,13 @@ static bool is_at_least_linuxkernel_2_6_ 
     4  */ 
     5 void 
     6 net_os_set_global_ifoptions(void) { 
    77+#if 0 
    8    FILE *proc_fwd; 
    9    const char *const procfile = version == AF_INET ? "/proc/sys/net/ipv4/ip_forward" : "/proc/sys/net/ipv6/conf/all/forwarding"; 
    10   
    11 @@ -150,6 +151,7 @@ 
    12      } 
    13      fclose(proc_fwd); 
    14    } 
    15 +#endif 
    16    return 1; 
    17  } 
    18   
    19 @@ -276,6 +278,7 @@ 
    20    OLSR_PRINTF(1, "Restoring network state\n"); 
    21   
    22    /* Restore IP forwarding to "off" */ 
    23 +#if 0 
    24    if (orig_fwd_state == '0') { 
    25      const char *const procfile = version == AF_INET ? "/proc/sys/net/ipv4/ip_forward" : "/proc/sys/net/ipv6/conf/all/forwarding"; 
    26      FILE *proc_fd; 
    27 @@ -288,6 +291,7 @@ 
    28        fclose(proc_fd); 
    29      } 
     8   if (writeToProc(olsr_cnf->ip_version == AF_INET ? PROC_IPFORWARD_V4 : PROC_IPFORWARD_V6, &orig_fwd_state, '1')) { 
     9     OLSR_PRINTF(1, "Warning, could not enable IP forwarding!\n" 
     10         "you should manually ensure that IP forwarding is enabled!\n\n"); 
     11     olsr_startup_sleep(3); 
    3012   } 
    3113+#endif 
    3214  
    33    /* Restore global ICMP redirect setting */ 
    34    if (orig_global_redirect_state != '0') { 
     15   if (olsr_cnf->smart_gw_active) { 
     16     char procfile[FILENAME_MAX]; 
     17@@ -266,10 +268,12 @@ net_os_restore_ifoptions(void) 
     18  
     19   OLSR_PRINTF(1, "Restoring network state\n"); 
     20  
     21+#if 0 
     22   /* Restore IP forwarding to "off" */ 
     23   if (writeToProc(olsr_cnf->ip_version == AF_INET ? PROC_IPFORWARD_V4 : PROC_IPFORWARD_V6, NULL, orig_fwd_state)) { 
     24     OLSR_PRINTF(1, "Error, could not restore ip_forward settings\n"); 
     25   } 
     26+#endif 
     27  
     28   if (olsr_cnf->smart_gw_active) { 
     29     /* Generate the procfile name */ 
Note: See TracChangeset for help on using the changeset viewer.