aboutsummaryrefslogtreecommitdiff
path: root/src/vpn
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-26 14:34:39 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-26 14:34:39 +0000
commit0c9ca79b2eb820c3266e9117f3ba9179cbdc2ff1 (patch)
tree434cab0d8aa45a4edc2cf9bd91c89bf3f2d5061b /src/vpn
parentaeb922926c639ffdd992f96cd125e47bb0e2c301 (diff)
downloadgnunet-0c9ca79b2eb820c3266e9117f3ba9179cbdc2ff1.tar.gz
gnunet-0c9ca79b2eb820c3266e9117f3ba9179cbdc2ff1.zip
-converting regular expressions of vpn/pt to non-binary format and adding proper policy parsing
Diffstat (limited to 'src/vpn')
-rw-r--r--src/vpn/gnunet-service-vpn.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index bba321f8c..edb70f5e0 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -803,13 +803,11 @@ create_tunnel_to_destination (struct DestinationTunnel *dt,
803 char address[GNUNET_TUN_IPV4_REGEXLEN]; 803 char address[GNUNET_TUN_IPV4_REGEXLEN];
804 804
805 GNUNET_TUN_ipv4toregexsearch (&dt->destination->details.exit_destination.ip.v4, 805 GNUNET_TUN_ipv4toregexsearch (&dt->destination->details.exit_destination.ip.v4,
806 "255.255.255.255", 806 dt->destination_port,
807 address); 807 address);
808 GNUNET_asprintf (&policy, "%s%s%s:%u", 808 GNUNET_asprintf (&policy, "%s%s",
809 GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX, 809 GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
810 "4", 810 address);
811 address,
812 (unsigned int) dt->destination_port);
813 break; 811 break;
814 } 812 }
815 case AF_INET6: 813 case AF_INET6:
@@ -817,12 +815,11 @@ create_tunnel_to_destination (struct DestinationTunnel *dt,
817 char address[GNUNET_TUN_IPV6_REGEXLEN]; 815 char address[GNUNET_TUN_IPV6_REGEXLEN];
818 816
819 GNUNET_TUN_ipv6toregexsearch (&dt->destination->details.exit_destination.ip.v6, 817 GNUNET_TUN_ipv6toregexsearch (&dt->destination->details.exit_destination.ip.v6,
820 128, address); 818 dt->destination_port,
821 GNUNET_asprintf (&policy, "%s%s%s:%u", 819 address);
820 GNUNET_asprintf (&policy, "%s%s",
822 GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX, 821 GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
823 "6", 822 address);
824 address,
825 (unsigned int) dt->destination_port);
826 break; 823 break;
827 } 824 }
828 default: 825 default: