Advertisement
tzarc

OPR fix

May 25th, 2017
75
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.49 KB | None | 0 0
  1. --- openvpn-policy-routing  2017-05-25 16:32:58.457954760 +1000
  2. +++ openvpn-policy-routing.patched  2017-05-25 16:33:22.247518925 +1000
  3. @@ -334,21 +334,19 @@
  4.     config_get raddr   "$1" remote_addrs
  5.     config_get rport   "$1" remote_ports
  6.  
  7. -   case $gw in
  8. -       wan | tun* | tap*)
  9. -           if [ "$ip_family" == "ipv6" ]; then
  10. -               mark=$(eval echo "\$mark6_$gw")
  11. -#              [ -n "$laddr" ] && laddr="[$laddr]"
  12. -#              [ -n "$raddr" ] && raddr="[$raddr]"
  13. -           else
  14. -               mark=$(eval echo "\$mark_$gw")
  15. -           fi
  16. -           [ -z "$mark" ] && { output "$_error_: $p_name unknown fw_mark for ${ip_family}/${gw}!\n"; return 1; }
  17. -           param="-t mangle -I OPR_CHAIN 1 -j MARK --set-xmark ${mark}/${FW_MASK}"
  18. -           ;;
  19. -       *)
  20. -           output "$_error_: $p_name unknown policy gateway ($gw)!\n"; return 1;;
  21. -   esac
  22. +   if [ "$gw" == "wan" ] || is_vpn "$gw"; then
  23. +       if [ "$ip_family" == "ipv6" ]; then
  24. +           mark=$(eval echo "\$mark6_$gw")
  25. +#          [ -n "$laddr" ] && laddr="[$laddr]"
  26. +#          [ -n "$raddr" ] && raddr="[$raddr]"
  27. +       else
  28. +           mark=$(eval echo "\$mark_$gw")
  29. +       fi
  30. +       [ -z "$mark" ] && { output "$_error_: $p_name unknown fw_mark for ${ip_family}/${gw}!\n"; return 1; }
  31. +       param="-t mangle -I OPR_CHAIN 1 -j MARK --set-xmark ${mark}/${FW_MASK}"
  32. +   else
  33. +       output "$_error_: $p_name unknown policy gateway ($gw)!\n"; return 1
  34. +   fi
  35.     [ -z "$laddr" ] && [ -z "$lport" ] && [ -z "$raddr" ] && [ -z "$rport" ] && output "$_error_: $p_name policy '$comment' missing all IPs/ports!\n" && return
  36.  
  37.     [ -n "$laddr" ] && param="$param -s $laddr"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement