summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas2014-04-05 12:00:31 +0000
committerÁlvaro Fernández Rojas2014-04-05 12:00:31 +0000
commit7682bd90392cf1e3fcbf5230c4974dcb8bd5a68a (patch)
tree554852111d6acc620773d92f399bc84af1518583
parentb905f3f159695ebb928e2b32b54fcc164a9aa40d (diff)
downloadrouting-7682bd90392cf1e3fcbf5230c4974dcb8bd5a68a.tar.gz
[mcproxy] Update to latest version.
Avoid building for GCC 4.4 and GCC 4.6 (no c++11 support). Move to routing and redirection menu. Config cleanup (disable until configured, protocol info, example instances).
-rw-r--r--mcproxy/Makefile7
-rw-r--r--mcproxy/files/mcproxy.conf30
2 files changed, 12 insertions, 25 deletions
diff --git a/mcproxy/Makefile b/mcproxy/Makefile
index b96268a..364223d 100644
--- a/mcproxy/Makefile
+++ b/mcproxy/Makefile
@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mcproxy
-PKG_SOURCE_VERSION:=986523a5d714be5cf6f65e4399045cbfecd415fd
-PKG_VERSION:=2014-03-25-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=df2d117dd67a7948f86d7effc5b9ea8f372466d8
+PKG_VERSION:=2014-04-05-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
@@ -25,9 +25,10 @@ include $(INCLUDE_DIR)/cmake.mk
define Package/mcproxy
SECTION:=net
CATEGORY:=Network
+ SUBMENU:=Routing and Redirection
TITLE:=Multicast Proxy for IGMP/MLD
URL:=http://mcproxy.realmv6.org
- DEPENDS:=+libpthread +libstdcpp
+ DEPENDS:=+libpthread +libstdcpp @(!GCC_VERSION_4_4&&!GCC_VERSION_4_6)
endef
define Package/mcproxy/description
diff --git a/mcproxy/files/mcproxy.conf b/mcproxy/files/mcproxy.conf
index 533c0f9..60a655e 100644
--- a/mcproxy/files/mcproxy.conf
+++ b/mcproxy/files/mcproxy.conf
@@ -2,27 +2,13 @@
##-- mcproxy configuration script --##
######################################
-protocol MLDv2; #IPv6
-protocol IGMPv3; #IPv4
+# Erase or comment out the following line when configured
+disable;
-#pinstance myProxy: eth0 ==> eth1 eth2;
-#pinstance my_second_instance: tun1 ==> "vlan-eth0.2";
-
-#
-# This confiugration example creates
-# a multicast proxy for ipv4 with the
-# upstream eth0 and two downstreams.
-#
-# |
-# |
-# +------+-----+
-# | eth0 |
-# | |
-# | myProxy |
-# | |
-# | eth1 eth2 |
-# +---+----+---+
-# | |
-# | |
-#
+# Protocol: IGMPv1|IGMPv2|IGMPv3 (IPv4) - MLDv1|MLDv2 (IPv6)
+protocol IGMPv3;
+# Proxy Instance: upstream ==> downstream
+pinstance proxy1: eth1 ==> "eth0.1";
+#pinstance proxy2: "eth0.2" ==> "br-lan";
+#pinstance proxy3: eth0 ==> eth1 eth2;