[Debian-iot-packaging] [oor] 04/04: Import Debian changes 1.2.0+ds1-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Sun Sep 24 20:33:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository oor.
commit 603d027e2f6f4581067cf96dd125d97be0da12cc
Merge: 5230054 ec28813
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Mon Sep 18 19:10:00 2017 +0200
Import Debian changes 1.2.0+ds1-1
openoverlayrouter (1.2.0+ds1-1) unstable; urgency=medium
* new upstream release
* update patches
* debian/control: bump standard to 4.1.0 (no changes)
* debian/control: put maintenance to debian-iot
AUTHORS | 2 +
README.android.md | 81 +-
README.md | 25 +-
README.vpp.md | 106 +++
VPP/oor_ctrl-plugin/Makefile.am | 59 ++
VPP/oor_ctrl-plugin/configure.ac | 11 +
VPP/oor_ctrl-plugin/oor_ctrl.am | 31 +
VPP/oor_ctrl-plugin/oor_ctrl/node.c | 202 +++++
VPP/oor_ctrl-plugin/oor_ctrl/oor_ctrl.api | 24 +
VPP/oor_ctrl-plugin/oor_ctrl/oor_ctrl.c | 435 ++++++++++
VPP/oor_ctrl-plugin/oor_ctrl/oor_ctrl.h | 73 ++
.../oor_ctrl-plugin/oor_ctrl/oor_ctrl_all_api_h.h | 16 +-
.../oor_ctrl-plugin/oor_ctrl/oor_ctrl_msg_enum.h | 31 +-
VPP/oor_ctrl-plugin/oor_ctrl/oor_ctrl_test.c | 178 ++++
VPP/oor_pkt_miss-plugin/Makefile.am | 59 ++
VPP/oor_pkt_miss-plugin/configure.ac | 11 +
VPP/oor_pkt_miss-plugin/oor_pkt_miss.am | 31 +
VPP/oor_pkt_miss-plugin/oor_pkt_miss/node.c | 129 +++
.../oor_pkt_miss/oor_pkt_miss.api | 112 +++
.../oor_pkt_miss/oor_pkt_miss.c | 906 +++++++++++++++++++++
.../oor_pkt_miss/oor_pkt_miss.h | 49 ++
.../oor_pkt_miss/oor_pkt_miss_all_api_h.h | 16 +-
.../oor_pkt_miss/oor_pkt_miss_msg_enum.h | 31 +-
.../oor_pkt_miss/oor_pkt_miss_test.c | 363 +++++++++
VPP/vpp.patch | 148 ++++
debian/changelog | 9 +
debian/control | 7 +-
debian/patches/change-prefix.patch | 20 +-
...piler-warnings.patch.applied-upstream-in-1.2.0} | 0
debian/patches/do-not-call.patch | 9 +-
debian/patches/hardening.patch | 10 +-
debian/patches/series | 3 +-
debian/patches/spelling.patch | 243 ++----
...ch => spelling.patch.applied-upstream-in-1.2.0} | 0
netconf/README | 36 +-
netconf/netconf.conf.example | 72 ++
netconf/oor_Makefile | 5 +
netconf/oor_api_netconf.c | 1 -
oor/Makefile | 84 +-
oor/cmdline.c | 6 +-
oor/cmdline.h | 8 +-
oor/config/oor_api.c | 1 -
oor/config/oor_api_internals.c | 107 ++-
oor/config/oor_config_confuse.c | 188 +++--
oor/config/oor_config_confuse.h | 2 +-
oor/config/oor_config_functions.c | 151 ++--
oor/config/oor_config_functions.h | 12 +-
oor/config/oor_config_uci.c | 270 ++++--
oor/config/oor_config_uci.h | 2 +-
.../control-data-plane/control-data-plane.c | 2 +
.../control-data-plane/control-data-plane.h | 2 +
oor/control/control-data-plane/tun/cdp_tun.c | 77 +-
oor/control/control-data-plane/vpnapi/cdp_vpnapi.c | 14 +-
oor/control/control-data-plane/vpp/cdp_vpp.c | 390 +++++++++
.../control-data-plane/vpp/cdp_vpp.h} | 21 +-
oor/control/lisp_ms.c | 5 +-
oor/control/lisp_xtr.c | 426 +++++-----
oor/control/lisp_xtr.h | 6 +-
oor/control/oor_control.c | 57 +-
oor/control/oor_control.h | 11 +-
oor/control/oor_ctrl_device.c | 28 +-
oor/control/oor_ctrl_device.h | 17 +-
oor/control/oor_local_db.c | 2 +-
oor/control/oor_local_db.h | 3 +-
oor/data-plane/data-plane.c | 2 +
oor/data-plane/data-plane.h | 8 +-
oor/data-plane/encapsulations/vxlan-gpe.c | 11 +
oor/data-plane/encapsulations/vxlan-gpe.h | 2 +-
oor/data-plane/ttable.c | 137 ++++
oor/{lib => data-plane}/ttable.h | 14 +-
oor/data-plane/tun/tun.c | 593 +++++---------
oor/data-plane/tun/tun.h | 26 +-
oor/data-plane/tun/tun_output.c | 114 +--
oor/data-plane/tun/tun_output.h | 2 -
oor/data-plane/vpnapi/vpnapi.c | 227 ++++--
oor/data-plane/vpnapi/vpnapi.h | 11 +-
oor/data-plane/vpnapi/vpnapi_input.c | 2 +-
oor/data-plane/vpnapi/vpnapi_output.c | 125 +--
oor/data-plane/vpnapi/vpnapi_output.h | 2 -
oor/data-plane/vpp/vpp.c | 520 ++++++++++++
oor/data-plane/{tun/tun_output.h => vpp/vpp.h} | 32 +-
oor/defs.h | 13 +-
.../flow_balancing.c => balancing_locators.c} | 515 ++++--------
.../flow_balancing.h => balancing_locators.h} | 22 +-
oor/fwd_policies/flow_balancing/flow_balancing.c | 568 +++----------
oor/fwd_policies/flow_balancing/flow_balancing.h | 22 +-
oor/fwd_policies/flow_balancing/fwd_entry_tuple.c | 49 ++
.../flow_balancing/fwd_entry_tuple.h} | 33 +-
oor/fwd_policies/fwd_addr_func.c | 154 ++++
.../vpnapi.h => fwd_policies/fwd_addr_func.h} | 17 +-
oor/fwd_policies/fwd_policy.c | 17 +-
oor/fwd_policies/fwd_policy.h | 22 +-
oor/fwd_policies/fwd_utils.c | 52 ++
.../vpnapi/vpnapi.h => fwd_policies/fwd_utils.h} | 19 +-
oor/fwd_policies/vpp_balancing/fwd_entry_vpp.c | 88 ++
oor/fwd_policies/vpp_balancing/fwd_entry_vpp.h | 46 ++
oor/fwd_policies/vpp_balancing/vpp_balancing.c | 455 +++++++++++
oor/fwd_policies/vpp_balancing/vpp_balancing.h | 29 +
oor/iface_list.c | 482 +++--------
oor/iface_list.h | 32 +-
oor/lib/cksum.c | 2 +-
oor/lib/generic_list.c | 16 +-
oor/lib/generic_list.h | 49 +-
oor/lib/iface_locators.c | 3 +-
oor/lib/iface_locators.h | 2 +-
oor/lib/interfaces_lib.c | 327 ++++++++
oor/lib/interfaces_lib.h | 37 +
oor/lib/lbuf.c | 12 +
oor/lib/lbuf.h | 29 +-
oor/lib/lisp_site.h | 3 +-
oor/lib/map_cache_entry.c | 16 +-
oor/lib/map_cache_entry.h | 5 +-
oor/lib/map_local_entry.c | 24 +-
oor/lib/map_local_entry.h | 22 +-
oor/lib/mapping_db.c | 7 +-
oor/lib/mapping_db.h | 3 +-
oor/lib/nonces_table.c | 4 -
oor/lib/nonces_table.h | 8 +-
oor/lib/oor_log.c | 8 +-
oor/lib/packets.c | 144 +++-
oor/lib/packets.h | 13 +-
oor/lib/prefixes.c | 44 +-
oor/lib/prefixes.h | 7 +
oor/lib/routing_tables_lib.c | 60 +-
oor/lib/routing_tables_lib.h | 6 -
oor/lib/shash.c | 4 +-
oor/lib/sockets-util.c | 6 +-
oor/lib/sockets-util.h | 4 +-
oor/lib/sockets.c | 54 +-
oor/lib/sockets.h | 28 +-
oor/lib/timers.c | 10 +
oor/lib/timers.h | 10 +-
oor/lib/ttable.c | 220 -----
oor/lib/util.c | 47 +-
oor/lib/util.h | 3 +
oor/lib/vpp_api/ctrl_vpp_plugin.c | 135 +++
oor/lib/vpp_api/pkt_miss_vpp_plugin.c | 288 +++++++
oor/lib/vpp_api/vpp_api.c | 105 +++
oor/lib/vpp_api/vpp_api.h | 15 +
oor/lib/vpp_api/vpp_api_reply.c | 256 ++++++
oor/lib/vpp_api/vpp_api_requests.c | 314 +++++++
oor/lib/vpp_api/vpp_api_requests.h | 143 ++++
oor/liblisp/liblisp.c | 5 +-
oor/liblisp/lisp_address.c | 17 +-
oor/liblisp/lisp_address.h | 60 +-
oor/liblisp/lisp_ip.h | 66 +-
oor/liblisp/lisp_lcaf.c | 32 +-
oor/liblisp/lisp_lcaf.h | 381 ++++-----
oor/liblisp/lisp_locator.c | 15 +-
oor/liblisp/lisp_locator.h | 27 +-
oor/liblisp/lisp_mapping.c | 9 +-
oor/liblisp/lisp_mapping.h | 4 +-
oor/liblisp/lisp_message_fields.c | 6 +-
oor/liblisp/lisp_messages.c | 34 +-
oor/{ => net_mgr/kernel}/iface_mgmt.c | 397 +++------
oor/{ => net_mgr/kernel}/iface_mgmt.h | 3 +-
oor/net_mgr/kernel/netm_kernel.c | 812 ++++++++++++++++++
.../prefixes.h => net_mgr/kernel/netm_kernel.h} | 41 +-
.../control-data-plane.c => net_mgr/net_mgr.c} | 12 +-
oor/net_mgr/net_mgr.h | 50 ++
oor/net_mgr/net_mgr_proc_fc.c | 188 +++++
.../tun/tun_output.h => net_mgr/net_mgr_proc_fc.h} | 31 +-
oor/net_mgr/vpp/netm_vpp.c | 545 +++++++++++++
oor/{lib/prefixes.h => net_mgr/vpp/netm_vpp.h} | 47 +-
oor/oor.c | 162 ++--
oor/oor.conf.example | 28 +-
oor/oor.ggo | 4 +-
oor/oor_external.h | 1 +
168 files changed, 11349 insertions(+), 4020 deletions(-)
diff --cc debian/changelog
index 8948d58,0000000..b69ed60
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,14 @@@
++openoverlayrouter (1.2.0+ds1-1) unstable; urgency=medium
++
++ * new upstream release
++ * update patches
++ * debian/control: bump standard to 4.1.0 (no changes)
++ * debian/control: put maintenance to debian-iot
++
++ -- Thorsten Alteholz <debian at alteholz.de> Mon, 18 Sep 2017 19:10:00 +0200
++
+openoverlayrouter (1.1.1+ds1-1) unstable; urgency=medium
+
+ * Initial release (Closes: #853880)
+
+ -- Thorsten Alteholz <debian at alteholz.de> Sun, 12 Feb 2017 18:10:00 +0100
diff --cc debian/control
index b44a896,0000000..8ec65cc
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,0 +1,33 @@@
+Source: openoverlayrouter
- Maintainer: Thorsten Alteholz <debian at alteholz.de>
++Maintainer: Debian IoT Maintainers <debian-iot-maintainers at lists.alioth.debian.org>
++Uploaders: Thorsten Alteholz <debian at alteholz.de>
+Section: network
+Priority: optional
+Build-Depends: debhelper (>=10)
+ , dh-exec (>=0.2)
+ , quilt
+ , libzmq3-dev
+ , libconfuse-dev
+ , libcap2-bin
+ , gengetopt
+ , libxml2-dev
- Standards-Version: 3.9.8
++Standards-Version: 4.1.0
+Homepage: http://openoverlayrouter.org/
++Vcs-Browser: https://anonscm.debian.org/cgit/debian-iot/oor.git
++Vcs-Git: https://anonscm.debian.org/git/debian-iot/oor.git
+
+Package: openoverlayrouter
+Section: misc
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: deploy programmable overlay networks
+ The OpenOverlayRouter (OOR) project aims to deliver a flexible and modular
+ open-source implementation to deploy programmable overlay networks. It
+ leverages on encapsulating overlay-specific packets into underlay-compatible
+ packets at the edges of the instantiated overlay and route them over the
+ physical underlying infrastructure. In order to do so, it maps overlay
+ identifiers to underlay locators and keeps those mappings updated over
+ time. In the current version, OOR uses the LISP protocol for the
+ control-plane (e.g. mapping retrieval and updating, etc), NETCONF/YANG for
+ the management-plane (e.g. overlay identifiers provisioning, etc) and can
+ use both LISP and VXLAN-GPE headers for encapsulation.
diff --cc debian/patches/change-prefix.patch
index 8cb97e3,0000000..b7e46e6
mode 100644,000000..100644
--- a/debian/patches/change-prefix.patch
+++ b/debian/patches/change-prefix.patch
@@@ -1,16 -1,0 +1,22 @@@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: move software to /usr/sbin
- Index: OpenOverlayRouter/oor/Makefile
++Index: oor-1.2.0/oor/Makefile
+===================================================================
- --- OpenOverlayRouter.orig/oor/Makefile 2017-01-26 12:56:03.000000000 +0100
- +++ OpenOverlayRouter/oor/Makefile 2017-01-27 09:58:44.033440179 +0100
- @@ -105,7 +105,8 @@
++--- oor-1.2.0.orig/oor/Makefile 2017-09-18 09:58:39.490957496 +0200
+++++ oor-1.2.0/oor/Makefile 2017-09-18 10:02:10.016261515 +0200
++@@ -150,7 +150,7 @@
+ endif
+
+ EXE = oor
+-PREFIX = /usr/local/sbin
- +#XXX original: PREFIX = /usr/local/sbin
++PREFIX = /usr/sbin
- INCLUDE = -I. -Iliblisp -Ielibs -Ilib -Icontrol -Idata-tun -Ifwd_balancing -Ifwd_balancing/flow_balancing
++ INCLUDE = -I. -Iliblisp -Ielibs -Ilib -Icontrol -Idata-tun -Ifwd_balancing -Ifwd_policies/flow_balancing \
++ -Inet_mgr -Inet_mgr/kernel -Inet_mgr/vpp
+
- $(EXE): $(OBJS)
++@@ -193,4 +193,4 @@
++ #XXX setcap cap_net_raw,cap_net_admin+ep $(DESTDIR)$(PREFIX)/$(EXE)
++
++ tags:
++- cscope -R -b
++\ No newline at end of file
+++ cscope -R -b
diff --cc debian/patches/compiler-warnings.patch.applied-upstream-in-1.2.0
index b304b89,0000000..b304b89
mode 100644,000000..100644
--- a/debian/patches/compiler-warnings.patch.applied-upstream-in-1.2.0
+++ b/debian/patches/compiler-warnings.patch.applied-upstream-in-1.2.0
diff --cc debian/patches/do-not-call.patch
index 4d744f7,0000000..ac8a1f6
mode 100644,000000..100644
--- a/debian/patches/do-not-call.patch
+++ b/debian/patches/do-not-call.patch
@@@ -1,15 -1,0 +1,16 @@@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: don't use setcap during build
- Index: OpenOverlayRouter/oor/Makefile
++Index: oor-1.2.0/oor/Makefile
+===================================================================
- --- OpenOverlayRouter.orig/oor/Makefile 2016-09-16 11:18:01.000000000 +0200
- +++ OpenOverlayRouter/oor/Makefile 2017-01-26 12:55:49.252166981 +0100
- @@ -142,7 +142,7 @@
++--- oor-1.2.0.orig/oor/Makefile 2017-09-18 09:57:42.836454134 +0200
+++++ oor-1.2.0/oor/Makefile 2017-09-18 09:57:42.828453781 +0200
++@@ -187,7 +187,7 @@
+
+ install: $(EXE)
+ mkdir -p $(DESTDIR)$(PREFIX) && cp $(EXE) $(DESTDIR)$(PREFIX)
+- setcap cap_net_raw,cap_net_admin+ep $(DESTDIR)$(PREFIX)/$(EXE)
++ #XXX setcap cap_net_raw,cap_net_admin+ep $(DESTDIR)$(PREFIX)/$(EXE)
+
+ tags:
+ cscope -R -b
++\ No newline at end of file
diff --cc debian/patches/hardening.patch
index d16ba70,0000000..2608530
mode 100644,000000..100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@@ -1,16 -1,0 +1,16 @@@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: add hardening flags
- Index: OpenOverlayRouter/oor/Makefile
++Index: oor-1.2.0/oor/Makefile
+===================================================================
- --- OpenOverlayRouter.orig/oor/Makefile 2017-02-01 11:10:47.820616232 +0100
- +++ OpenOverlayRouter/oor/Makefile 2017-02-01 11:11:12.489613983 +0100
- @@ -18,6 +18,9 @@
++--- oor-1.2.0.orig/oor/Makefile 2017-09-18 09:58:39.494957672 +0200
+++++ oor-1.2.0/oor/Makefile 2017-09-18 09:58:39.490957496 +0200
++@@ -25,6 +25,9 @@
+ GENGETOPT = gengetopt
+ ERROR = false
+
++# add hardening flags
++LDFLAGS += -z now
++CFLAGS += -D_FORTIFY_SOURCE=2
+
+ ifeq "$(platform)" ""
- CFLAGS += -Wall -std=gnu89 -g -I/usr/include/libxml2
++ CFLAGS += -Wall -std=gnu89 -g -I/usr/include/libxml2 -D_GNU_SOURCE
diff --cc debian/patches/series
index 7b2cad4,0000000..cbdbeea
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,4 @@@
+do-not-call.patch
++hardening.patch
+change-prefix.patch
+spelling.patch
- compiler-warnings.patch
- hardening.patch
diff --cc debian/patches/spelling.patch
index 5ddde9b,0000000..1681662
mode 100644,000000..100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@@ -1,198 -1,0 +1,75 @@@
- Author: Thorsten Alteholz <debian at alteholz.de>
- Description: take care of Lintian spelling checks
- Index: OpenOverlayRouter/oor/config/oor_api_internals.c
++Index: oor-1.2.0/oor/control/lisp_xtr.c
+===================================================================
- --- OpenOverlayRouter.orig/oor/config/oor_api_internals.c 2017-01-27 11:32:34.836426542 +0100
- +++ OpenOverlayRouter/oor/config/oor_api_internals.c 2017-01-27 11:32:34.828426219 +0100
- @@ -80,7 +80,7 @@
- }else if (strcmp(str_afi,"lcaf") == 0){
-
- }else{
- - OOR_LOG(LDBG_2,"OOR_API->lxml_get_lisp_addr: Afi not suppoted: %s",str_afi);
- + OOR_LOG(LDBG_2,"OOR_API->lxml_get_lisp_addr: Afi not supported: %s",str_afi);
- return NULL;
- }
-
- @@ -121,7 +121,7 @@
- shash_insert(lcaf_ht,strdup(name),laddr);
- return (strdup(name));
- }else{
- - OOR_LOG(LDBG_2,"OOR_API->lxml_get_char_lisp_addr: Afi not suppoted: %s",str_afi);
- + OOR_LOG(LDBG_2,"OOR_API->lxml_get_char_lisp_addr: Afi not supported: %s",str_afi);
- free(str_afi);
- return (NULL);
- }
- @@ -205,7 +205,7 @@
- xml_elp_node = lxml_get_next_node(xml_elp_node);
- }
- }else {
- - OOR_LOG(LDBG_2,"OOR_API->lxml_lcaf_get_lisp_addr: LCAF type not suppoted: %s",lcaf_type);
- + OOR_LOG(LDBG_2,"OOR_API->lxml_lcaf_get_lisp_addr: LCAF type not supported: %s",lcaf_type);
- return (NULL);
- }
- free(lcaf_type);
- @@ -354,7 +354,7 @@
- }
- free(key_type_aux);
- if (key_type != HMAC_SHA_1_96){
- - OOR_LOG(LERR, "Configuraton file: Only SHA-1 (1) authentication is supported");
- + OOR_LOG(LERR, "Configuration file: Only SHA-1 (1) authentication is supported");
- free(str_addr);
- free(key);
- return (BAD);
- Index: OpenOverlayRouter/oor/config/oor_config_functions.c
- ===================================================================
- --- OpenOverlayRouter.orig/oor/config/oor_config_functions.c 2017-01-27 11:32:34.836426542 +0100
- +++ OpenOverlayRouter/oor/config/oor_config_functions.c 2017-01-27 11:32:34.828426219 +0100
- @@ -296,13 +296,13 @@
- glist_entry_t *it;
-
- if (str_addr == NULL || key_type == 0 || key == NULL){
- - OOR_LOG(LERR, "Configuraton file: Wrong Map Server configuration. "
- + OOR_LOG(LERR, "Configuration file: Wrong Map Server configuration. "
- "Check configuration file");
- exit_cleanup();
- }
-
- if (key_type != HMAC_SHA_1_96){
- - OOR_LOG(LERR, "Configuraton file: Only SHA-1 (1) authentication is supported");
- + OOR_LOG(LERR, "Configuration file: Only SHA-1 (1) authentication is supported");
- exit_cleanup();
- }
-
- @@ -912,7 +912,7 @@
- }
- if (locator != NULL){
- glist_add(locator,loct_list);
- - OOR_LOG(LDBG_2,"parse_rloc_address: Locator stucture created: \n %s",
- + OOR_LOG(LDBG_2,"parse_rloc_address: Locator structure created: \n %s",
- locator_to_char(locator));
- }
- }
- @@ -970,7 +970,7 @@
- locator = locator_new_init(address, iface->status,1,1,conf_loc_iface->priority,
- conf_loc_iface->weight,conf_loc_iface->mpriority, conf_loc_iface->mweight);
-
- - OOR_LOG(LDBG_2,"parse_rloc_address: Locator stucture created: \n %s",
- + OOR_LOG(LDBG_2,"parse_rloc_address: Locator structure created: \n %s",
- locator_to_char(locator));
-
- /* If the locator is for a local mapping, associate the locator with the interface */
- Index: OpenOverlayRouter/oor/oor.ggo
- ===================================================================
- --- OpenOverlayRouter.orig/oor/oor.ggo 2017-01-27 11:32:34.836426542 +0100
- +++ OpenOverlayRouter/oor/oor.ggo 2017-01-27 11:32:34.828426219 +0100
- @@ -23,7 +23,7 @@
-
- defmode "oorconfig"
-
- -modeoption "debug" d "Debuging output [0..3]"
- +modeoption "debug" d "Debugging output [0..3]"
- int values="0","1","2","3" enum mode="oorconfig" optional
-
- modeoption "afi" a "Default RLOCs afi [4,6]"
- Index: OpenOverlayRouter/oor/control/lisp_xtr.c
- ===================================================================
- --- OpenOverlayRouter.orig/oor/control/lisp_xtr.c 2017-01-27 11:32:34.836426542 +0100
- +++ OpenOverlayRouter/oor/control/lisp_xtr.c 2017-01-27 11:32:34.828426219 +0100
- @@ -1675,7 +1675,7 @@
- if (mce == NULL){
++--- oor-1.2.0.orig/oor/control/lisp_xtr.c 2017-09-18 09:58:11.881737518 +0200
+++++ oor-1.2.0/oor/control/lisp_xtr.c 2017-09-18 10:14:27.796931666 +0200
++@@ -1713,7 +1713,7 @@
+ /* It is a PeTR RLOC */
- if ( mcache_entry_mapping(xtr->petrs) != map ){
++ mce = get_proxy_etrs_for_afi(xtr,lisp_addr_ip_afi(mapping_eid(map)));
++ if ( rparg->mce != mce ){
+- OOR_LOG(LERR,"rloc_probing: No map cache entry for EID %s. It should never happend",
++ OOR_LOG(LERR,"rloc_probing: No map cache entry for EID %s. It should never happened",
+ lisp_addr_to_char(mapping_eid(map)));
+ return (BAD);
+ }
- @@ -2650,7 +2650,7 @@
- break;
- case ACT_SEND_MREQ:
- // TODO: To be implemented. Now drop paquet
- - OOR_LOG(LDBG_2, "Recived a packet of an entry with ACT send map req. Drop packet");
- + OOR_LOG(LDBG_2, "Received a packet of an entry with ACT send map req. Drop packet");
- lisp_addr_del(src_eid);
- lisp_addr_del(dst_eid);
- fwd_info->neg_map_reply_act = ACT_NO_ACTION;
- Index: OpenOverlayRouter/oor/control/oor_control.c
++Index: oor-1.2.0/oor/data-plane/tun/tun.c
+===================================================================
- --- OpenOverlayRouter.orig/oor/control/oor_control.c 2017-01-27 11:32:34.836426542 +0100
- +++ OpenOverlayRouter/oor/control/oor_control.c 2017-01-27 11:32:34.828426219 +0100
- @@ -95,7 +95,7 @@
++--- oor-1.2.0.orig/oor/data-plane/tun/tun.c 2017-07-26 16:15:33.000000000 +0200
+++++ oor-1.2.0/oor/data-plane/tun/tun.c 2017-09-18 10:15:04.338554462 +0200
++@@ -883,7 +883,7 @@
+ }
+
- free(ctrl);
- - OOR_LOG(LDBG_1,"Lisp controler destroyed");
- + OOR_LOG(LDBG_1,"Lisp controller destroyed");
- }
++ if (strcmp(eid_prefix_char,FULL_IPv4_ADDRESS_SPACE) == 0){ // Update of the PeTR list for IPv4 EIDs or RTR list
++- OOR_LOG(LDBG_3, "tun_rm_fwd_from_entry: Removing all the forwading entries association with the PeTRs for IPv4 EIDs");
+++ OOR_LOG(LDBG_3, "tun_rm_fwd_from_entry: Removing all the forwarding entries association with the PeTRs for IPv4 EIDs");
++ pxtr_fwd_tpl_list = (glist_t *)shash_lookup(data->eid_to_dp_entries,FULL_IPv4_ADDRESS_SPACE);
++ /* Remove all the entries associated with the PxTR */
+
- void
- @@ -189,7 +189,7 @@
- /*
- * Return the default control rlocs in a list that shoud be released
- * by the user.
- - * @param ctrl Lisp controler to be used
- + * @param ctrl Lisp controller to be used
- * @return glist_t * with the lisp_addr_t * of the default rlocs
- */
- glist_t *
- Index: OpenOverlayRouter/oor/iface_mgmt.c
++@@ -895,7 +895,7 @@
++ tun_rm_fwd_from_entry(fi->associated_entry,is_local);
++ }
++ }else if(strcmp(eid_prefix_char,FULL_IPv6_ADDRESS_SPACE) == 0){ // Update of the PeTR list for IPv6 EIDs or RTR list
++- OOR_LOG(LDBG_3, "tun_rm_fwd_from_entry: Removing all the forwading entries association with the PeTRs for IPv6 EIDs");
+++ OOR_LOG(LDBG_3, "tun_rm_fwd_from_entry: Removing all the forwarding entries association with the PeTRs for IPv6 EIDs");
++ pxtr_fwd_tpl_list = (glist_t *)shash_lookup(data->eid_to_dp_entries,FULL_IPv6_ADDRESS_SPACE);
++ /* Remove all the entries associated with the PxTR */
++
++@@ -907,7 +907,7 @@
++ tun_rm_fwd_from_entry(fi->associated_entry,is_local);
++ }
++ }else{
++- OOR_LOG(LDBG_3, "tun_rm_fwd_from_entry: Removing all the forwading entries association with the EID %s",eid_prefix_char);
+++ OOR_LOG(LDBG_3, "tun_rm_fwd_from_entry: Removing all the forwarding entries association with the EID %s",eid_prefix_char);
++ fwd_tpl_list = (glist_t *)shash_lookup(data->eid_to_dp_entries,eid_prefix_char);
++ if (!fwd_tpl_list){
++ OOR_LOG(LDBG_1, "tun_rm_fwd_from_entry: Entry %s not found in the shasht!",eid_prefix_char);
++Index: oor-1.2.0/oor/data-plane/vpnapi/vpnapi.c
+===================================================================
- --- OpenOverlayRouter.orig/oor/iface_mgmt.c 2017-01-27 11:32:34.836426542 +0100
- +++ OpenOverlayRouter/oor/iface_mgmt.c 2017-01-27 11:32:34.828426219 +0100
- @@ -354,7 +354,7 @@
-
- if ( rtm->rtm_family != AF_INET && rtm->rtm_family != AF_INET6 ) {
- OOR_LOG(LDBG_3,"process_nl_new_unicast_route: New unicast route of "
- - "unknown adddress family %d", rtm->rtm_family);
- + "unknown address family %d", rtm->rtm_family);
- return;
++--- oor-1.2.0.orig/oor/data-plane/vpnapi/vpnapi.c 2017-07-26 16:15:33.000000000 +0200
+++++ oor-1.2.0/oor/data-plane/vpnapi/vpnapi.c 2017-09-18 10:15:27.411579129 +0200
++@@ -357,7 +357,7 @@
+ }
+
- @@ -577,7 +577,7 @@
++ if (strcmp(eid_prefix_char,FULL_IPv4_ADDRESS_SPACE) == 0){ // Update of the PeTR list for IPv4 EIDs or RTR list
++- OOR_LOG(LDBG_3, "vpnapi_rm_fwd_from_entry: Removing all the forwading entries association with the PeTRs for IPv4 EIDs");
+++ OOR_LOG(LDBG_3, "vpnapi_rm_fwd_from_entry: Removing all the forwarding entries association with the PeTRs for IPv4 EIDs");
++ pxtr_fwd_tpl_list = (glist_t *)shash_lookup(data->eid_to_dp_entries,FULL_IPv4_ADDRESS_SPACE);
++ /* Remove all the entries associated with the PxTR */
+
- if ( rtm->rtm_family != AF_INET && rtm->rtm_family != AF_INET6 ) {
- OOR_LOG(LDBG_3,"process_nl_del_unicast_route: New unicast route of "
- - "unknown adddress family %d", rtm->rtm_family);
- + "unknown address family %d", rtm->rtm_family);
- return;
- }
-
- Index: OpenOverlayRouter/oor/lib/packets.c
- ===================================================================
- --- OpenOverlayRouter.orig/oor/lib/packets.c 2017-01-27 11:32:34.836426542 +0100
- +++ OpenOverlayRouter/oor/lib/packets.c 2017-01-27 11:32:34.828426219 +0100
- @@ -479,7 +479,7 @@
- break;
- default:
- OOR_LOG(LDBG_2,
- - "build_ip_header: Uknown AFI of the source address: %d",
- + "build_ip_header: Unknown AFI of the source address: %d",
- lisp_addr_ip_afi(src_addr));
- return (NULL);
- }
- Index: OpenOverlayRouter/oor/liblisp/lisp_address.c
- ===================================================================
- --- OpenOverlayRouter.orig/oor/liblisp/lisp_address.c 2017-01-27 11:32:34.836426542 +0100
- +++ OpenOverlayRouter/oor/liblisp/lisp_address.c 2017-01-27 11:32:34.828426219 +0100
- @@ -476,7 +476,7 @@
- memset(offset, 0, sizeof(uint16_t));
- return (sizeof(uint16_t));
- default:
- - OOR_LOG(LDBG_3, "lisp_addr_write_to_pkt: Unkown afi %d",
- + OOR_LOG(LDBG_3, "lisp_addr_write_to_pkt: Unknown afi %d",
- lisp_addr_lafi(laddr));
- break;
- }
- Index: OpenOverlayRouter/oor/data-plane/tun/tun_output.c
- ===================================================================
- --- OpenOverlayRouter.orig/oor/data-plane/tun/tun_output.c 2016-09-16 11:18:01.000000000 +0200
- +++ OpenOverlayRouter/oor/data-plane/tun/tun_output.c 2017-01-27 11:33:05.813676404 +0100
- @@ -212,7 +212,7 @@
- case ACT_NO_ACTION:
- case ACT_SEND_MREQ:
- case ACT_DROP:
- - OOR_LOG(LDBG_3, "tun_output_unicast: Packet droped");
- + OOR_LOG(LDBG_3, "tun_output_unicast: Packet dropped");
- return (GOOD);
- case ACT_NATIVE_FWD:
- return(tun_forward_native(b, &tuple->dst_addr));
++@@ -369,7 +369,7 @@
++ vpnapi_rm_fwd_from_entry(fi->associated_entry,is_local);
++ }
++ }else if(strcmp(eid_prefix_char,FULL_IPv6_ADDRESS_SPACE) == 0){ // Update of the PeTR list for IPv6 EIDs or RTR list
++- OOR_LOG(LDBG_3, "vpnapi_rm_fwd_from_entry: Removing all the forwading entries association with the PeTRs for IPv6 EIDs");
+++ OOR_LOG(LDBG_3, "vpnapi_rm_fwd_from_entry: Removing all the forwarding entries association with the PeTRs for IPv6 EIDs");
++ pxtr_fwd_tpl_list = (glist_t *)shash_lookup(data->eid_to_dp_entries,FULL_IPv6_ADDRESS_SPACE);
++ /* Remove all the entries associated with the PxTR */
++
++@@ -381,7 +381,7 @@
++ vpnapi_rm_fwd_from_entry(fi->associated_entry,is_local);
++ }
++ }else{
++- OOR_LOG(LDBG_3, "vpnapi_rm_fwd_from_entry: Removing all the forwading entries association with the EID %s",eid_prefix_char);
+++ OOR_LOG(LDBG_3, "vpnapi_rm_fwd_from_entry: Removing all the forwarding entries association with the EID %s",eid_prefix_char);
++ fwd_tpl_list = (glist_t *)shash_lookup(data->eid_to_dp_entries,eid_prefix_char);
++ if (!fwd_tpl_list){
++ OOR_LOG(LDBG_1, "vpnapi_rm_fwd_from_entry: Entry %s not found in the shasht!",eid_prefix_char);
diff --cc debian/patches/spelling.patch.applied-upstream-in-1.2.0
index 5ddde9b,0000000..5ddde9b
mode 100644,000000..100644
--- a/debian/patches/spelling.patch.applied-upstream-in-1.2.0
+++ b/debian/patches/spelling.patch.applied-upstream-in-1.2.0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/oor.git
More information about the Debian-iot-packaging
mailing list