From af17e19901290b7c8e3dddaab1128033b06979b4 Mon Sep 17 00:00:00 2001 From: pritchardv Date: Wed, 8 Nov 2017 16:40:39 +0000 Subject: [PATCH 01/43] Set socket TTL to configured session-ttl before accepting connections Signed-off-by: pritchardv --- Dlep.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Dlep.cpp b/Dlep.cpp index c7b3a28..9e65430 100644 --- a/Dlep.cpp +++ b/Dlep.cpp @@ -465,6 +465,21 @@ Dlep::start_dlep() session_acceptor = new boost::asio::ip::tcp::acceptor(io_service_, boost::asio::ip::tcp::endpoint(session_address, session_port)); + + // Set the socket's TTL to the session-ttl config parameter + // if it exists. + + try + { + unsigned int ttl; + dlep_client.get_config_parameter("session-ttl", &ttl); + session_acceptor->set_option(boost::asio::ip::unicast::hops(ttl)); + } + catch (LLDLEP::DlepClient::BadParameterName) + { + // Let the default TTL take effect. + } + start_async_accept(); } else // we're the router From 122492f70f20685580e66fa459d92c46fe312390 Mon Sep 17 00:00:00 2001 From: pritchardv Date: Wed, 8 Nov 2017 16:41:01 +0000 Subject: [PATCH 02/43] Send Peer Offer to correct port Signed-off-by: pritchardv --- PeerDiscovery.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PeerDiscovery.cpp b/PeerDiscovery.cpp index 3b14c51..d0fcdaf 100644 --- a/PeerDiscovery.cpp +++ b/PeerDiscovery.cpp @@ -593,7 +593,7 @@ PeerDiscovery::send_peer_offer(boost::asio::ip::udp::endpoint to_endpoint) } boost::asio::ip::udp::endpoint send_endpoint(to_endpoint.address(), - udp_port); + to_endpoint.port()); msg << "Sending signal to " << send_endpoint; LOG(DLEP_LOG_INFO, msg); From 78bba1fcf086d8f800039cccf4784ab93226a0da Mon Sep 17 00:00:00 2001 From: pritchardv Date: Wed, 8 Nov 2017 16:41:43 +0000 Subject: [PATCH 03/43] Use RFC8175 IANA assigned port Signed-off-by: pritchardv --- config/modem.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/modem.xml b/config/modem.xml index 4adc184..e2e7ff9 100644 --- a/config/modem.xml +++ b/config/modem.xml @@ -4,10 +4,10 @@ modem 1 eth0 - 30002 + 854 225.0.0.44 5 - 30003 + 854 5 2 emulated-modem From 75f96232048a23aa3eed039d30fd2c8dc335ed3c Mon Sep 17 00:00:00 2001 From: pritchardv Date: Wed, 8 Nov 2017 16:41:52 +0000 Subject: [PATCH 04/43] Set TTL to 255 Signed-off-by: pritchardv --- config/modem.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/modem.xml b/config/modem.xml index e2e7ff9..3ceb08e 100644 --- a/config/modem.xml +++ b/config/modem.xml @@ -7,6 +7,8 @@ 854 225.0.0.44 5 + 255 + 255 854 5 2 From 4e7ae17162648edad5d7e59d9597ae6953c6f0f8 Mon Sep 17 00:00:00 2001 From: pritchardv Date: Wed, 8 Nov 2017 16:40:39 +0000 Subject: [PATCH 05/43] Set socket TTL to configured session-ttl before accepting connections Signed-off-by: pritchardv --- Dlep.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Dlep.cpp b/Dlep.cpp index df27941..56bc83e 100644 --- a/Dlep.cpp +++ b/Dlep.cpp @@ -463,6 +463,21 @@ Dlep::start_dlep() session_acceptor = new boost::asio::ip::tcp::acceptor(io_service_, boost::asio::ip::tcp::endpoint(session_address, session_port)); + + // Set the socket's TTL to the session-ttl config parameter + // if it exists. + + try + { + unsigned int ttl; + dlep_client.get_config_parameter("session-ttl", &ttl); + session_acceptor->set_option(boost::asio::ip::unicast::hops(ttl)); + } + catch (LLDLEP::DlepClient::BadParameterName) + { + // Let the default TTL take effect. + } + start_async_accept(); } else // we're the router From 73ad0e059730821c57d3972f66451df34ca3249a Mon Sep 17 00:00:00 2001 From: pritchardv Date: Wed, 8 Nov 2017 16:41:52 +0000 Subject: [PATCH 06/43] Set TTL to 255 Signed-off-by: pritchardv --- config/modem.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/modem.xml b/config/modem.xml index 9232108..dc59e9b 100644 --- a/config/modem.xml +++ b/config/modem.xml @@ -17,6 +17,8 @@ as a modem. 225.0.0.117 60 + 255 + 255 4854 From 31c9017b71dc84f971a37fd866d59e4f524e6749 Mon Sep 17 00:00:00 2001 From: taylorr Date: Fri, 24 Aug 2018 11:37:13 +0100 Subject: [PATCH 07/43] Add syntax = "proto2"; to silence a protobuf compiler warning. Signed-off-by: taylorr --- destadvert.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/destadvert.proto b/destadvert.proto index ecaf51f..0db201d 100644 --- a/destadvert.proto +++ b/destadvert.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message DestinationAdvertisement { required uint32 reportinterval = 1; // report interval in seconds required uint32 sequencenumber = 2; // sequence number From a16ca8bcc34444e5d92d43fd450d77e3149a928b Mon Sep 17 00:00:00 2001 From: airbus-mipn Date: Fri, 24 Jan 2020 12:40:31 +0000 Subject: [PATCH 08/43] Adding fix for "catch by value" compiler warning --- Dlep.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Dlep.cpp b/Dlep.cpp index 56bc83e..e5fd91a 100644 --- a/Dlep.cpp +++ b/Dlep.cpp @@ -464,19 +464,18 @@ Dlep::start_dlep() new boost::asio::ip::tcp::acceptor(io_service_, boost::asio::ip::tcp::endpoint(session_address, session_port)); - // Set the socket's TTL to the session-ttl config parameter - // if it exists. - + // Set the socket's TTL to the session-ttl config parameter + // if it exists. try - { - unsigned int ttl; - dlep_client.get_config_parameter("session-ttl", &ttl); - session_acceptor->set_option(boost::asio::ip::unicast::hops(ttl)); - } - catch (LLDLEP::DlepClient::BadParameterName) - { - // Let the default TTL take effect. - } + { + unsigned int ttl; + dlep_client.get_config_parameter("session-ttl", &ttl); + session_acceptor->set_option(boost::asio::ip::unicast::hops(ttl)); + } + catch (const LLDLEP::DlepClient::BadParameterName &) + { + // Let the default TTL take effect. + } start_async_accept(); } From 37483475735a1c91307e1ff2ae98eaecf915ab31 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 11:48:35 +0000 Subject: [PATCH 09/43] Adding gitlab-ci.yml' --- .gitlab-ci.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..a1a723a --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,37 @@ +image: dkr-reg1.mipn:5000/debian_stable_build + +stages: + - build + - test + - deploy + +build: + stage: build + script: + - cd build + - mkdir release + - cmake -DCMAKE_INSTALL_PREFIX:PATH=./release .. + - make install + - tar zcf "../${CI_PROJECT_NAME}.tar.gz" release + artifacts: + name: "${CI_PROJECT_NAME}-binaries" + paths: + - "${CI_PROJECT_NAME}.tar.gz" + +test: + stage: test + script: + - make test + +deploy: + stage: deploy + dependencies: + - build + - test + only: + refs: + - master + variables: + - $CI_PROJECT_NAMESPACE == "laf" + script: + - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "${NEXUS_STAGING_DIR}/${CI_PROJECT_NAME}-binaries.tar.gz" From ae985490aa7abea241f4d1d348a242c87b2cc702 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 11:57:20 +0000 Subject: [PATCH 10/43] updating gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1a723a..6067b79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,7 @@ build: test: stage: test script: + - cd build - make test deploy: From a45353645eaeb512cefe1e83f1cc6e5afe1e2bb5 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 12:25:41 +0000 Subject: [PATCH 11/43] updating gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6067b79..e4605d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ test: stage: test script: - cd build + - cmake .. - make test deploy: From b7a8deb89fa3d49c338c22c370f671549ee715fe Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 12:41:28 +0000 Subject: [PATCH 12/43] updating gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4605d6..1c8d27a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,7 @@ test: script: - cd build - cmake .. + - make - make test deploy: From 62eb2d9fc3306cc9b03f2e8e6871ccdcf93f523f Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 15:37:10 +0000 Subject: [PATCH 13/43] Changed to use ll_dlep_debian_stable_build image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c8d27a..9d913ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: dkr-reg1.mipn:5000/debian_stable_build +image: dkr-reg1.mipn:5000/ll_dlep_debian_stable_build stages: - build From 394d5e415280eefc764227805c21f704a5e67b9f Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 16:13:04 +0000 Subject: [PATCH 14/43] Updating gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d913ba..f55436d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,9 +14,9 @@ build: - make install - tar zcf "../${CI_PROJECT_NAME}.tar.gz" release artifacts: - name: "${CI_PROJECT_NAME}-binaries" + name: "${CI_PROJECT_NAME}" paths: - - "${CI_PROJECT_NAME}.tar.gz" + - "LL_DLEP/build/release" test: stage: test From c050709279fead095ac13bd55153f723877ad9bc Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 16:30:25 +0000 Subject: [PATCH 15/43] Updating gitlab-ci.yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f55436d..4e98c92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,11 +12,10 @@ build: - mkdir release - cmake -DCMAKE_INSTALL_PREFIX:PATH=./release .. - make install - - tar zcf "../${CI_PROJECT_NAME}.tar.gz" release artifacts: name: "${CI_PROJECT_NAME}" paths: - - "LL_DLEP/build/release" + - "build/release" test: stage: test From 9bb7471e3fe2882406e1db97e35d12db933cee88 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 16:46:13 +0000 Subject: [PATCH 16/43] Updating gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e98c92..6501341 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,4 +36,4 @@ deploy: variables: - $CI_PROJECT_NAMESPACE == "laf" script: - - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "${NEXUS_STAGING_DIR}/${CI_PROJECT_NAME}-binaries.tar.gz" + - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.zip" "${NEXUS_STAGING_DIR}/${CI_PROJECT_NAME}-binaries.zip" From 55958fde91d440a72b76b9aabacc8a5a77369491 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 17:13:18 +0000 Subject: [PATCH 17/43] Updating gitlab-ci.yml --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6501341..176fdf4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,10 +19,12 @@ build: test: stage: test + dependencies: + - build script: - cd build - - cmake .. - - make +# - cmake .. +# - make - make test deploy: @@ -36,4 +38,6 @@ deploy: variables: - $CI_PROJECT_NAMESPACE == "laf" script: + - pwd + - ls -al - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.zip" "${NEXUS_STAGING_DIR}/${CI_PROJECT_NAME}-binaries.zip" From a3e1cb46a0192a8ad9d5cbd56b1d24e1fe9b5bf6 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 17:20:32 +0000 Subject: [PATCH 18/43] Updating gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 176fdf4..5217b38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,8 @@ test: - build script: - cd build + - pwd + - ls # - cmake .. # - make - make test From 334fc7217ac46414377df023345968003c0e061e Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 27 Jan 2020 17:28:07 +0000 Subject: [PATCH 19/43] Updating gitlab-ci.yml --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5217b38..e446bd3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,9 +22,11 @@ test: dependencies: - build script: + - pwd + - ls -al - cd build - pwd - - ls + - ls -al # - cmake .. # - make - make test From c369a0af0b7ef949fe55d7f8331913e8186650ac Mon Sep 17 00:00:00 2001 From: laf Date: Tue, 28 Jan 2020 09:52:07 +0000 Subject: [PATCH 20/43] Updating gitlab-ci.yml --- .gitlab-ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e446bd3..8b3b7db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,13 +22,9 @@ test: dependencies: - build script: - - pwd - - ls -al - cd build - - pwd - - ls -al -# - cmake .. -# - make + - cmake .. + - make - make test deploy: From f6776c0e413d170b4101ff0c789bf2e670cfcacf Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 31 Jan 2020 13:44:50 +0000 Subject: [PATCH 21/43] Updating .gitlab-ci.yml --- .gitlab-ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b3b7db..d9ef9e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,8 +19,6 @@ build: test: stage: test - dependencies: - - build script: - cd build - cmake .. @@ -29,9 +27,6 @@ test: deploy: stage: deploy - dependencies: - - build - - test only: refs: - master From ca15db7470446c66cc8054dfe2ea43d1d0c76cb5 Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 31 Jan 2020 14:02:30 +0000 Subject: [PATCH 22/43] Updating .gitlab-ci.yml --- .gitlab-ci.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9ef9e1..34931ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,16 +17,20 @@ build: paths: - "build/release" -test: - stage: test - script: - - cd build - - cmake .. - - make - - make test +#test: +# stage: test +# script: +# - cd build +# - cmake .. +# - make +# - make test deploy: stage: deploy + dependencies: + - build + environment: + - staging only: refs: - master From 115c95d7e10c811eb20ddad39fc7d9140570afe2 Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 31 Jan 2020 14:10:24 +0000 Subject: [PATCH 23/43] Updating .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34931ab..5d23fa8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,4 +39,6 @@ deploy: script: - pwd - ls -al + - ls -al build + - ls -al build/release - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.zip" "${NEXUS_STAGING_DIR}/${CI_PROJECT_NAME}-binaries.zip" From 68ad69d60c77acd5e6a6a6f2a68bc5a06c418e3f Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 31 Jan 2020 14:15:37 +0000 Subject: [PATCH 24/43] Updating .gitlab-ci.yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d23fa8..5316aae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,8 +29,7 @@ deploy: stage: deploy dependencies: - build - environment: - - staging + environment: staging only: refs: - master From 376ef40c29af63f0729367f51f8a5d7906512502 Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 31 Jan 2020 14:25:38 +0000 Subject: [PATCH 25/43] Updating .gitlab-ci.yml --- .gitlab-ci.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5316aae..f0b57d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,15 +15,17 @@ build: artifacts: name: "${CI_PROJECT_NAME}" paths: - - "build/release" + - "build" -#test: -# stage: test -# script: -# - cd build -# - cmake .. -# - make -# - make test +test: + stage: test + script: + - pwd + - ls -al + - ls -al build + - ls -al build/release + - cd build + - make test deploy: stage: deploy From 3e2b9428e68c3aac931da83a4640f9bfe7a8f05a Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 3 Feb 2020 15:35:58 +0000 Subject: [PATCH 26/43] Updating ci config --- .gitlab-ci.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0b57d2..6d53f0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,10 +20,6 @@ build: test: stage: test script: - - pwd - - ls -al - - ls -al build - - ls -al build/release - cd build - make test @@ -38,8 +34,5 @@ deploy: variables: - $CI_PROJECT_NAMESPACE == "laf" script: - - pwd - - ls -al - - ls -al build - - ls -al build/release - - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.zip" "${NEXUS_STAGING_DIR}/${CI_PROJECT_NAME}-binaries.zip" + - tar zcf "${CI_PROJECT_NAME}.tar.gz" ./build/release + - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "${NEXUS_THRID_PARTY_DIR}/${CI_PROJECT_NAME}-binaries.tar.gz" From 7c40bc69ea514c91aafb7e45c7db4fb3bb0ce453 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 3 Feb 2020 15:58:04 +0000 Subject: [PATCH 27/43] Updating ci file --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d53f0d..e92e8c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,12 +27,11 @@ deploy: stage: deploy dependencies: - build - environment: staging only: refs: - master variables: - - $CI_PROJECT_NAMESPACE == "laf" + - $CI_PROJECT_NAMESPACE == "plexos/dev/thrid-party" script: - tar zcf "${CI_PROJECT_NAME}.tar.gz" ./build/release - - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "${NEXUS_THRID_PARTY_DIR}/${CI_PROJECT_NAME}-binaries.tar.gz" + - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "http://nexus.mipn/build_artefacts/third_party/${CI_PROJECT_NAME}-binaries.tar.gz" From c22df1dc34914d9550e17e1013038d6f707ecc12 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 3 Feb 2020 16:05:35 +0000 Subject: [PATCH 28/43] Updating ci file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e92e8c1..ef4c0df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ deploy: stage: deploy dependencies: - build + environment: staging only: refs: - master From aac5a2ebd3665c02a3ab365d7bb0278e130758f6 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 3 Feb 2020 16:09:11 +0000 Subject: [PATCH 29/43] Updating ci file --- .gitlab-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef4c0df..201ef98 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,14 +25,11 @@ test: deploy: stage: deploy - dependencies: - - build - environment: staging only: refs: - master variables: - - $CI_PROJECT_NAMESPACE == "plexos/dev/thrid-party" + - $CI_PROJECT_NAMESPACE == "plexos/dev/third-party" script: - tar zcf "${CI_PROJECT_NAME}.tar.gz" ./build/release - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "http://nexus.mipn/build_artefacts/third_party/${CI_PROJECT_NAME}-binaries.tar.gz" From f07cfbec2d6cade7b0390f81242fde6fa0fef598 Mon Sep 17 00:00:00 2001 From: laf Date: Tue, 4 Feb 2020 10:02:22 +0000 Subject: [PATCH 30/43] Updating ci file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 201ef98..0aa6e25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,4 +32,4 @@ deploy: - $CI_PROJECT_NAMESPACE == "plexos/dev/third-party" script: - tar zcf "${CI_PROJECT_NAME}.tar.gz" ./build/release - - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "http://nexus.mipn/build_artefacts/third_party/${CI_PROJECT_NAME}-binaries.tar.gz" + - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "${NEXUS_THIRD_PARTY_DIR}/${CI_PROJECT_NAME}-binaries.tar.gz" From 8dae5dd81342fe3748c5d84d5cd4d1ac75f1ff12 Mon Sep 17 00:00:00 2001 From: laf Date: Thu, 30 Apr 2020 15:18:33 +0100 Subject: [PATCH 31/43] Updating gitlab ci/cd to publish sources to nexus --- .gitlab-ci.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0aa6e25..03ada16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ test: - cd build - make test -deploy: +deploy_binaries: stage: deploy only: refs: @@ -33,3 +33,18 @@ deploy: script: - tar zcf "${CI_PROJECT_NAME}.tar.gz" ./build/release - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "${NEXUS_THIRD_PARTY_DIR}/${CI_PROJECT_NAME}-binaries.tar.gz" + +deploy_sources: + stage: deploy + dependencies: [] + only: + refs: + - master + variables: + - $CI_PROJECT_NAMESPACE == "plexos/dev/third-party" + variables: + ARCHIVE_NAME: "${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_src.tar.gz" + script: + - touch "${ARCHIVE_NAME}" + - tar --exclude-vcs --exclude="${ARCHIVE_NAME}" -zcf "${ARCHIVE_NAME}" . + - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${ARCHIVE_NAME}" "${NEXUS_THIRD_PARTY_DIR}/${ARCHIVE_NAME}" From 7992576107d9c46d96419fe7fa8b68218b0160b9 Mon Sep 17 00:00:00 2001 From: laf Date: Thu, 30 Apr 2020 16:39:55 +0100 Subject: [PATCH 32/43] Making test and doc generation optional --- CMakeLists.txt | 13 +++++++++++-- config/CMakeLists.txt | 14 ++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdb174d..19730bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required (VERSION 2.8) project (dlep) +option(BUILD_DOCS "Build Documentation" ON) +option(BUILD_TESTS "Build Tests" ON) + SET(DLEP_VERSION 2.1) # Release version of the software SET(SOVERSION 2.1) # The library version (e.g. libdlep.so.1.0 would be SOVERSION 1.0) @@ -109,8 +112,14 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package/copyright DESTINATION ${DOCDIR ENABLE_TESTING() add_subdirectory(config) -add_subdirectory(doc) -add_subdirectory(tests) + +if(BUILD_DOCS) + add_subdirectory(doc) +endif(BUILD_DOCS) + +if(BUILD_TESTS) + add_subdirectory(tests) +endif(BUILD_TESTS) # Linux Packaging SET(CPACK_PACKAGE_CONTACT "David P. Wiggins ") diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 4454520..15dcb62 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -4,12 +4,14 @@ file(GLOB DRAFTS_XML RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE # gather all xml/xsd files file(GLOB XML_INSTALL_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/protocol/*.x[ms][ld]) -foreach ( file ${XML_INSTALL_FILES} ) - add_test(wellformedxml_${file} ${LIBXML2_XMLLINT_EXECUTABLE} --noout ${CMAKE_CURRENT_SOURCE_DIR}/${file}) -endforeach(file) +if(BUILD_TESTS) + foreach ( file ${XML_INSTALL_FILES} ) + add_test(wellformedxml_${file} ${LIBXML2_XMLLINT_EXECUTABLE} --noout ${CMAKE_CURRENT_SOURCE_DIR}/${file}) + endforeach(file) -foreach ( file ${DRAFTS_XML} ) - add_test(validatedxml_${file} ${LIBXML2_XMLLINT_EXECUTABLE} --noout --xinclude --schema ${CMAKE_CURRENT_SOURCE_DIR}/protocol/protocol-config.xsd ${CMAKE_CURRENT_SOURCE_DIR}/${file}) -endforeach(file) + foreach ( file ${DRAFTS_XML} ) + add_test(validatedxml_${file} ${LIBXML2_XMLLINT_EXECUTABLE} --noout --xinclude --schema ${CMAKE_CURRENT_SOURCE_DIR}/protocol/protocol-config.xsd ${CMAKE_CURRENT_SOURCE_DIR}/${file}) + endforeach(file) +endif(BUILD_TESTS) install(FILES ${XML_INSTALL_FILES} DESTINATION ${ETCDIR}/dlep) From 9d1f23f039c555604bcccb97087d4e0ff4b1fb49 Mon Sep 17 00:00:00 2001 From: airbus-mipn Date: Fri, 1 May 2020 13:12:42 +0100 Subject: [PATCH 33/43] Adding cmake cmd line flags to make to control if docementation and tests get built --- CMakeLists.txt | 13 +++++++++++-- config/CMakeLists.txt | 14 ++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdb174d..19730bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required (VERSION 2.8) project (dlep) +option(BUILD_DOCS "Build Documentation" ON) +option(BUILD_TESTS "Build Tests" ON) + SET(DLEP_VERSION 2.1) # Release version of the software SET(SOVERSION 2.1) # The library version (e.g. libdlep.so.1.0 would be SOVERSION 1.0) @@ -109,8 +112,14 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package/copyright DESTINATION ${DOCDIR ENABLE_TESTING() add_subdirectory(config) -add_subdirectory(doc) -add_subdirectory(tests) + +if(BUILD_DOCS) + add_subdirectory(doc) +endif(BUILD_DOCS) + +if(BUILD_TESTS) + add_subdirectory(tests) +endif(BUILD_TESTS) # Linux Packaging SET(CPACK_PACKAGE_CONTACT "David P. Wiggins ") diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 4454520..15dcb62 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -4,12 +4,14 @@ file(GLOB DRAFTS_XML RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE # gather all xml/xsd files file(GLOB XML_INSTALL_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/protocol/*.x[ms][ld]) -foreach ( file ${XML_INSTALL_FILES} ) - add_test(wellformedxml_${file} ${LIBXML2_XMLLINT_EXECUTABLE} --noout ${CMAKE_CURRENT_SOURCE_DIR}/${file}) -endforeach(file) +if(BUILD_TESTS) + foreach ( file ${XML_INSTALL_FILES} ) + add_test(wellformedxml_${file} ${LIBXML2_XMLLINT_EXECUTABLE} --noout ${CMAKE_CURRENT_SOURCE_DIR}/${file}) + endforeach(file) -foreach ( file ${DRAFTS_XML} ) - add_test(validatedxml_${file} ${LIBXML2_XMLLINT_EXECUTABLE} --noout --xinclude --schema ${CMAKE_CURRENT_SOURCE_DIR}/protocol/protocol-config.xsd ${CMAKE_CURRENT_SOURCE_DIR}/${file}) -endforeach(file) + foreach ( file ${DRAFTS_XML} ) + add_test(validatedxml_${file} ${LIBXML2_XMLLINT_EXECUTABLE} --noout --xinclude --schema ${CMAKE_CURRENT_SOURCE_DIR}/protocol/protocol-config.xsd ${CMAKE_CURRENT_SOURCE_DIR}/${file}) + endforeach(file) +endif(BUILD_TESTS) install(FILES ${XML_INSTALL_FILES} DESTINATION ${ETCDIR}/dlep) From 4cd5deff1f67a0d13f2f5429be870c76eb37efcc Mon Sep 17 00:00:00 2001 From: laf Date: Tue, 18 Aug 2020 15:01:41 +0100 Subject: [PATCH 34/43] Build and publish --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03ada16..eac9cc6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,10 +29,10 @@ deploy_binaries: refs: - master variables: - - $CI_PROJECT_NAMESPACE == "plexos/dev/third-party" + - $CI_PROJECT_NAMESPACE == "netsim/third-party" script: - tar zcf "${CI_PROJECT_NAME}.tar.gz" ./build/release - - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "${NEXUS_THIRD_PARTY_DIR}/${CI_PROJECT_NAME}-binaries.tar.gz" + - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "${NEXUS_SIMULATION_THIRD_PARTY_DIR}/${CI_PROJECT_NAME}/${CI_PROJECT_NAME}-binaries.tar.gz" deploy_sources: stage: deploy @@ -41,10 +41,10 @@ deploy_sources: refs: - master variables: - - $CI_PROJECT_NAMESPACE == "plexos/dev/third-party" + - $CI_PROJECT_NAMESPACE == "netsim/third-party" variables: ARCHIVE_NAME: "${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_src.tar.gz" script: - touch "${ARCHIVE_NAME}" - tar --exclude-vcs --exclude="${ARCHIVE_NAME}" -zcf "${ARCHIVE_NAME}" . - - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${ARCHIVE_NAME}" "${NEXUS_THIRD_PARTY_DIR}/${ARCHIVE_NAME}" + - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${ARCHIVE_NAME}" "${NEXUS_SIMULATION_THIRD_PARTY_DIR}/${CI_PROJECT_NAME}/${ARCHIVE_NAME}" From 236b5979d81c043787d27a860f48d89bf1a61415 Mon Sep 17 00:00:00 2001 From: laf Date: Tue, 18 Aug 2020 15:27:08 +0100 Subject: [PATCH 35/43] Corrected spelling on filter --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eac9cc6..deb77f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ deploy_binaries: refs: - master variables: - - $CI_PROJECT_NAMESPACE == "netsim/third-party" + - $CI_PROJECT_NAMESPACE == "netsim/third_party" script: - tar zcf "${CI_PROJECT_NAME}.tar.gz" ./build/release - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "${NEXUS_SIMULATION_THIRD_PARTY_DIR}/${CI_PROJECT_NAME}/${CI_PROJECT_NAME}-binaries.tar.gz" @@ -41,7 +41,7 @@ deploy_sources: refs: - master variables: - - $CI_PROJECT_NAMESPACE == "netsim/third-party" + - $CI_PROJECT_NAMESPACE == "netsim/third_party" variables: ARCHIVE_NAME: "${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_src.tar.gz" script: From 442da60c69f4bc6d6242b7ac8f87a9fea686a0e6 Mon Sep 17 00:00:00 2001 From: laf Date: Tue, 18 Aug 2020 16:04:15 +0100 Subject: [PATCH 36/43] Updating gitlab ci --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index deb77f7..b58856b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,9 +30,11 @@ deploy_binaries: - master variables: - $CI_PROJECT_NAMESPACE == "netsim/third_party" + variables: + ARCHIVE_NAME: "${CI_PROJECT_NAME}_binaries_${CI_COMMIT_REF_NAME}.tar.gz" script: - - tar zcf "${CI_PROJECT_NAME}.tar.gz" ./build/release - - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${CI_PROJECT_NAME}.tar.gz" "${NEXUS_SIMULATION_THIRD_PARTY_DIR}/${CI_PROJECT_NAME}/${CI_PROJECT_NAME}-binaries.tar.gz" + - tar zcf ${CI_PROJECT_NAME} ./build/release + - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${ARCHIVE_NAME}" "${NEXUS_SIMULATION_THIRD_PARTY_DIR}/${CI_PROJECT_NAME}/${ARCHIVE_NAME}" deploy_sources: stage: deploy From 1d4e5b9a6d2545a10e1d42472d9778eaa91e22ab Mon Sep 17 00:00:00 2001 From: laf Date: Wed, 19 Aug 2020 11:55:14 +0100 Subject: [PATCH 37/43] Fixing typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b58856b..ab80a97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ deploy_binaries: variables: ARCHIVE_NAME: "${CI_PROJECT_NAME}_binaries_${CI_COMMIT_REF_NAME}.tar.gz" script: - - tar zcf ${CI_PROJECT_NAME} ./build/release + - tar zcf ${ARCHIVE_NAME} ./build/release - curl -vfs -u ${NEXUS_USERNAME}:${NEXUS_PASSWORD} --upload-file "${ARCHIVE_NAME}" "${NEXUS_SIMULATION_THIRD_PARTY_DIR}/${CI_PROJECT_NAME}/${ARCHIVE_NAME}" deploy_sources: From 86d7d4ff2b8f5fbb35eb800e1bbbd87dc00c07be Mon Sep 17 00:00:00 2001 From: laf Date: Wed, 19 Aug 2020 12:10:49 +0100 Subject: [PATCH 38/43] Correcting typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab80a97..9bb60c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ deploy_sources: variables: - $CI_PROJECT_NAMESPACE == "netsim/third_party" variables: - ARCHIVE_NAME: "${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_src.tar.gz" + ARCHIVE_NAME: "${CI_PROJECT_NAME}_src_${CI_COMMIT_REF_NAME}.tar.gz" script: - touch "${ARCHIVE_NAME}" - tar --exclude-vcs --exclude="${ARCHIVE_NAME}" -zcf "${ARCHIVE_NAME}" . From bb2058e3af9b34f87663a08117fddc75a75fae39 Mon Sep 17 00:00:00 2001 From: laf Date: Wed, 19 Aug 2020 14:02:12 +0100 Subject: [PATCH 39/43] Updated to use correct build image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bb60c0..6772818 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: dkr-reg1.mipn:5000/ll_dlep_debian_stable_build +image: dkr-reg1.mipn:5000/ll_dlep_build stages: - build From 96c48ea30f6d6f5b444debbfbf8535a9e0cb5dca Mon Sep 17 00:00:00 2001 From: laf Date: Wed, 19 Aug 2020 14:08:48 +0100 Subject: [PATCH 40/43] Use correct image tag --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6772818..790c76e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: dkr-reg1.mipn:5000/ll_dlep_build +image: dkr-reg1.mipn:5000/ll_dlep_build:master stages: - build From 849b312ffe0aa1a956de8bc47f21bdebc115204b Mon Sep 17 00:00:00 2001 From: Rick Taylor Date: Mon, 26 Apr 2021 16:04:27 +0100 Subject: [PATCH 41/43] Send peer offers back using the same port, not 854 Signed-off-by: Rick Taylor --- PeerDiscovery.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/PeerDiscovery.cpp b/PeerDiscovery.cpp index bd55666..a2853e1 100644 --- a/PeerDiscovery.cpp +++ b/PeerDiscovery.cpp @@ -590,9 +590,7 @@ PeerDiscovery::send_peer_offer(boost::asio::ip::udp::endpoint to_endpoint) pm.add_data_item(di_conn_pt); } - boost::asio::ip::udp::endpoint send_endpoint(to_endpoint.address(), - udp_port); - msg << "Sending signal to " << send_endpoint; + msg << "Sending signal to " << to_endpoint; LOG(DLEP_LOG_INFO, msg); // A freshly built message should be parseable. @@ -601,7 +599,7 @@ PeerDiscovery::send_peer_offer(boost::asio::ip::udp::endpoint to_endpoint) assert(err == ""); peer_offer_socket.async_send_to( - boost::asio::buffer(pm.get_buffer(), pm.get_length()), send_endpoint, + boost::asio::buffer(pm.get_buffer(), pm.get_length()), to_endpoint, boost::bind(&PeerDiscovery::handle_send_peer_offer, this, boost::asio::placeholders::error)); } From 6c7af4c7c6eea96b319d01b6f02b9f3fed26a278 Mon Sep 17 00:00:00 2001 From: Rick Taylor Date: Mon, 26 Apr 2021 16:46:20 +0100 Subject: [PATCH 42/43] Fix bad merge Signed-off-by: Rick Taylor --- Dlep.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Dlep.cpp b/Dlep.cpp index 908e058..e5fd91a 100644 --- a/Dlep.cpp +++ b/Dlep.cpp @@ -464,7 +464,6 @@ Dlep::start_dlep() new boost::asio::ip::tcp::acceptor(io_service_, boost::asio::ip::tcp::endpoint(session_address, session_port)); -<<<<<<< HEAD // Set the socket's TTL to the session-ttl config parameter // if it exists. try @@ -477,21 +476,6 @@ Dlep::start_dlep() { // Let the default TTL take effect. } -======= - // Set the socket's TTL to the session-ttl config parameter - // if it exists. - - try - { - unsigned int ttl; - dlep_client.get_config_parameter("session-ttl", &ttl); - session_acceptor->set_option(boost::asio::ip::unicast::hops(ttl)); - } - catch (LLDLEP::DlepClient::BadParameterName) - { - // Let the default TTL take effect. - } ->>>>>>> 5a91c308210309362233e5e24d950e9c21d8657a start_async_accept(); } From 9c566a2f82d0e3f709e90705a7e920745983236c Mon Sep 17 00:00:00 2001 From: Rick Taylor Date: Mon, 18 Oct 2021 12:35:07 +0100 Subject: [PATCH 43/43] Silence warning Signed-off-by: Rick Taylor --- DlepMac.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DlepMac.h b/DlepMac.h index 21b6ecc..b6885df 100644 --- a/DlepMac.h +++ b/DlepMac.h @@ -51,12 +51,12 @@ inline void getDifference(const DlepMacAddrs & A, const DlepMacAddrs & B, DlepMacAddrs & C) { // whats in here - for (const auto a : A) + for (const auto& a : A) { bool found = false; // and not in here - for (const auto b : B) + for (const auto& b : B) { if (a == b) {