olsrd hotplug

[stargieg]

Hi
If olsrd.@olsrd[0].IpVersion=6and4 is set then the hot plug script dose not work.

In that case the config files are named olsrd.conf.ipv4 and olsrd.conf.ipv6 and
the olsrd.conf file was rm by packages/olsrd/files/olsrd.init#L791
In packages/olsrd/files/olsrd.hotplug.sh#L55 and packages/olsrd/files/olsrd.hotplug.sh#L25
is olsrd.conf define.

Gruss
Patrick

[stargieg]

Workaround:

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 21e8215..7450342 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -788,7 +788,6 @@ start() {
        sysctl -w net.ipv6.bindv6only=1 > /dev/null
        sed -e '/[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/d' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv6
        sed -e 's/^IpVersion[ ][ ]*6$/IpVersion 4/' -e 's/^\t\t[A-Fa-f0-9.:]*[:][A-Fa-f0-9.:]*[ ][0-9]*$//' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv4
-       rm $OLSRD_CONFIG_FILE

        # some filenames should get the suffix .ipv6
        for file in $latlon_file $hosts_file $services_file $resolv_file $macs_file $wd_file;do

[zioproto]

Hello,
6and4 mode is badly broken :(
Using this mode you will find many other problems.

we had a plan to remove completely 6and4 mode and rework the package with

/etc/config/olsrd4
/etc/config/olsrd6

and two separates init scripts, so that i would be possible to stop and
start olsrd for IPv4 and IPv6 separately. However nobody had spare time to
implement this :(

2014/1/21 Patrick Grimm notifications@github.com

Workaround:

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 21e8215..7450342 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -788,7 +788,6 @@ start() {
sysctl -w net.ipv6.bindv6only=1 > /dev/null
sed -e '/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/d' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv6
sed -e 's/^IpVersion[ ][ ]6$/IpVersion 4/' -e 's/^\t\t[A-Fa-f0-9.:][:][A-Fa-f0-9.:][ ][0-9]$//' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv4

•   rm $OLSRD_CONFIG_FILE
  
  # some filenames should get the suffix .ipv6
  for file in $latlon_file $hosts_file $services_file $resolv_file $macs_file $wd_file;do
  

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/16#issuecomment-32888059
.

[stargieg]

Hi
"remove completely 6and4 mode"
Sounds like good.
Split olsrd package in
olsrd-core (bin,libs)
olsrd-ipv4 (config,init,watchdog,gwcheck)
olsrd-ipv6 (config,init,watchdog,gwcheck)

And yes, I have found more problems.

• olsr4
  • replace Interface Mode

`````` 's/ether/mesh/'```

• olsr6

• replace acl
  's/0\.0\.0\.0/::/'

• replace multicast
  's/224\.0\.0\.251/ff02::fb/'

• replace LinkQualityAlgorithm
  's/etx_ff/etx_ffeth/'

• disable NatThreshold
  '/NatThreshold/d'

• disable RtTable
  '/RtTable/d'

• disable dyn_gw_plain
  '/.*dyn_gw_plain.*/{N;N;N;d}'

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 21e8215..77bd61c 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -734,7 +734,6 @@ olsrd_setup_smartgw_rules() {
            else
                for IPT in $IP4T $IP6T; do
                    $IPT -I forwarding_rule -o tnl_+ -j ACCEPT
-                   $IPT -t nat -I postrouting_rule -o tnl_+ -j MASQUERADE
                  if [ "$nowan"="0" ]; then
                      for IFACE in $wanifnames; do
                          $IPT -A forwarding_rule -i tunl0 -o $IFACE -j ACCEPT
  @@ -744,6 +743,7 @@ olsrd_setup_smartgw_rules() {
                      $IPT -I input_rule -i $IFACE -p 4 -j ACCEPT
                  done
              done
-               $IP4T -t nat -I postrouting_rule -o tnl_+ -j MASQUERADE
          fi
      fi
  fi
  @@ -786,9 +786,9 @@ start() {
  if [ "$OLSRD_IPVERSION_6AND4" -ne 0 ]; then
      bindv6only="$(sysctl -n net.ipv6.bindv6only)"
      sysctl -w net.ipv6.bindv6only=1 > /dev/null
-       sed -e '/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/d' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv6
-       sed -e 's/^IpVersion[ ][ ]_6$/IpVersion 4/' -e 's/^\t\t[A-Fa-f0-9.:]_[:][A-Fa-f0-9.:]_[ ][0-9]_$//' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv4
-       rm $OLSRD_CONFIG_FILE
-       sed -e 's/0.0.0.0/::/' -e 's/224.0.0.251/ff02::fb/' -e '/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/d' -e 's/etx_ff/etx_ffeth/' -e '/NatThreshold/d' -e '/RtTable/d' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv6
-       sed -i /var/etc/olsrd.conf.ipv6 -e '/._dyn_gw_plain._/{N;N;N;d}'
- ```
    sed -e 's/^IpVersion[ ][ ]*6$/IpVersion 4/' -e 's/^MainIp.*//' -e 's/^\tPlParam \"[A-Fa-f0-9.:]*[:][A-Fa-f0-9.:].*//' -e 's/^\t\t[A-Fa-f0-9.:]*[:][A-Fa-f0-9.:]*[ ][0-9]*$//' -e 's/ether/mesh/' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv4
  
  # some filenames should get the suffix .ipv6
  for file in $latlon_file $hosts_file $services_file $resolv_file $macs_file $wd_file;do
  ```

```
```

[mmunz]

Ack, i also think 6and4 should go away. The idea for 6and4 was a nice one, it makes the config easier in some cases, but in others more difficult. I.e. wanting to have different configs for v4 and v6 or having to restart both olsrd instances when i only need to restart one.