diff options
author | joerg <joerg@pkgsrc.org> | 2020-04-17 00:20:45 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2020-04-17 00:20:45 +0000 |
commit | ff0e8328117dededfbad977d81790eb2ca8cac51 (patch) | |
tree | 5962ef8b85d6cbc7653b56a395d2f2841133c881 /net | |
parent | 965f5b7b057ebf2a00eb43730965eacc6860cfb8 (diff) | |
download | pkgsrc-ff0e8328117dededfbad977d81790eb2ca8cac51.tar.gz |
Fix C++ code
- on NetBSD, undef if_name as the macro conflicts with the local use
- don't return a value in a void function
- fix const issues
Diffstat (limited to 'net')
-rw-r--r-- | net/xorp/distinfo | 15 | ||||
-rw-r--r-- | net/xorp/patches/patch-fea_data__plane_io_io__ip__socket.cc | 13 | ||||
-rw-r--r-- | net/xorp/patches/patch-fea_io__ip__manager.hh | 16 | ||||
-rw-r--r-- | net/xorp/patches/patch-fea_io__link.hh | 16 | ||||
-rw-r--r-- | net/xorp/patches/patch-libxipc_finder__msgs.cc | 15 | ||||
-rw-r--r-- | net/xorp/patches/patch-libxipc_xrl__pf__factory.cc | 13 | ||||
-rw-r--r-- | net/xorp/patches/patch-libxorp_ipnet.hh | 20 | ||||
-rw-r--r-- | net/xorp/patches/patch-libxorp_ipvxnet.hh | 13 | ||||
-rw-r--r-- | net/xorp/patches/patch-mld6igmp_xrl__mld6igmp__node.hh | 15 | ||||
-rw-r--r-- | net/xorp/patches/patch-pim_xrl__pim__node.hh | 15 | ||||
-rw-r--r-- | net/xorp/patches/patch-policy_common_element.cc | 13 | ||||
-rw-r--r-- | net/xorp/patches/patch-rip_output.hh | 13 |
12 files changed, 170 insertions, 7 deletions
diff --git a/net/xorp/distinfo b/net/xorp/distinfo index a0a65df58b9..03d54e3afb3 100644 --- a/net/xorp/distinfo +++ b/net/xorp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2016/01/07 15:51:58 jperkin Exp $ +$NetBSD: distinfo,v 1.27 2020/04/17 00:20:45 joerg Exp $ SHA1 (xorp-1.6.tar.gz) = 366d32068ed76b8ec69958b601d4fbde61ef4cbb RMD160 (xorp-1.6.tar.gz) = 32b3f6d03defc816ed983088e61b5e808de17f98 @@ -20,27 +20,32 @@ SHA1 (patch-fea_data__plane_control__socket_click__socket.hh) = 1e0ea2de08a131a9 SHA1 (patch-fea_data__plane_control__socket_netlink__socket.hh) = 2b2c774a8e9778d438292850f4a310403d019365 SHA1 (patch-fea_data__plane_control__socket_routing__socket.hh) = 1acad764066424d1fc457ea7e130636257248530 SHA1 (patch-fea_data__plane_control__socket_windows__rtm__pipe.hh) = 608b22a8507e2a44c5eea26e964c6201e7240420 -SHA1 (patch-fea_data__plane_io_io__ip__socket.cc) = 4e1cd4341e037e288cb636e8ebfa7483d73c311a +SHA1 (patch-fea_data__plane_io_io__ip__socket.cc) = 0c3261ae8695191a11a5205330da9d8be88f4bd3 +SHA1 (patch-fea_io__ip__manager.hh) = 32217f4400e56a9ae50d0e210634baddcfd3a512 +SHA1 (patch-fea_io__link.hh) = 23e6285c25fe4fb032869aa146e6bc16ee064001 SHA1 (patch-libfeaclient_ifmgr__atoms.hh) = 702363b8346820d92a84ae9798c06b4e2d5b62f9 SHA1 (patch-libproto_config__node__id.hh) = 83f79e69c5fff84d01bb6ce2f311dd1802bcc92a SHA1 (patch-libproto_packet.hh) = a5e8a8fe88bbaf20ef48cf136770fb5f7325b400 SHA1 (patch-libxipc_finder.cc) = 941d01e3f041c9ad2ea73671b42b1ef7daac0e7b SHA1 (patch-libxipc_finder__messenger.hh) = f1a36df79516ac03a69e3e9ba56dc1b56bc6d886 +SHA1 (patch-libxipc_finder__msgs.cc) = ccfc6ffa60026896ed3cfd38afe74be54423d7e5 SHA1 (patch-libxipc_xrl__atom.cc) = 5b2dd8488570477c362017faa41eb9191cd2b48b SHA1 (patch-libxipc_xrl__atom.hh) = 28a3a0f4b95181655eb1297a1229921c95fdd198 SHA1 (patch-libxipc_xrl__error.hh) = efce8151c2211526a3a27d6f7cb7b599c46bd84b +SHA1 (patch-libxipc_xrl__pf__factory.cc) = c98e7896bd8c8c56ac5e2556ef17dabf93fa7f02 SHA1 (patch-libxipc_xrl__pf__stcp__ph.cc) = 306e5c27cd371f206233ff70ce3d38493157fd00 SHA1 (patch-libxipc_xrl__router.hh) = b29884206da7a9c40c26b1e20f5bf4dccd9da42a SHA1 (patch-libxipc_xuid.cc) = 0d2711e92b162817b0a76d2d4fc15edd4b3be29e SHA1 (patch-libxorp_asnum.hh) = 1417273aa26e473a10094c35062459ae89b34d85 SHA1 (patch-libxorp_asyncio.cc) = 1288ac42bac5e5f1cdfa98ef26036379d7ff1d2e SHA1 (patch-libxorp_heap.cc) = 45abbc27a4391f3312e6048d632b56c9e5091fa7 -SHA1 (patch-libxorp_ipnet.hh) = 2c5556102041b308690da9222337b5fdf5b9cb6b +SHA1 (patch-libxorp_ipnet.hh) = 29cb37c5eda422756f24d4a6b642cf5cab7daf2f SHA1 (patch-libxorp_ipv4.hh) = 7dacee6127e762d7d08118de7297253a0e5fbc08 SHA1 (patch-libxorp_ipv6.cc) = d1d0793c0b28f4b40c96ffd26036ddc6c3d14623 SHA1 (patch-libxorp_ipv6.hh) = 5cd56bec545bf211bf1e1a20d84dc982083b81e2 SHA1 (patch-libxorp_ipvx.cc) = 97c95f85eb44649bd3996ca649c26485737d7b21 SHA1 (patch-libxorp_ipvx.hh) = 9571418d19de88cc40bc57a6007ecc5ebb79262c +SHA1 (patch-libxorp_ipvxnet.hh) = 923aa12af6a4f1e78e5f600ca52a3eab3f166a36 SHA1 (patch-libxorp_range.hh) = 54367fa70507b6dc4f53785125c5e4264580837e SHA1 (patch-libxorp_ref__ptr.hh) = 2209c7ff7e15ab2fd9a6bd5dcb9c9742c3e0da74 SHA1 (patch-libxorp_safe__callback__obj.hh) = a5019173b864829dd96f55c92d831dd98a1b0d84 @@ -52,6 +57,7 @@ SHA1 (patch-libxorp_trie.hh) = 4acfee1fc1222271c3d2b6b8840d2fcf6213418f SHA1 (patch-libxorp_utility.h) = 8c29d67c38ac8ff37725c1617aa18f5182cdfe28 SHA1 (patch-libxorp_vif.hh) = 1eee80ed1dd8ee37049c8960348cf63362da840a SHA1 (patch-libxorp_xorp.h) = 2bba60932a2d8873c784c30e0a3970b4e857ee0c +SHA1 (patch-mld6igmp_xrl__mld6igmp__node.hh) = f0ab64a930773afaacb75e439f3bc489b2702f4a SHA1 (patch-ospf_packet.cc) = b172129d5f754dc66a3d99d75320fd78208033fe SHA1 (patch-ospf_peer.cc) = 2a30dbf655ae194bb47a882c095f5a83973e80be SHA1 (patch-ospf_vertex.hh) = 13964d74717a6ec6a01bad501c72652f9261f0f9 @@ -60,10 +66,12 @@ SHA1 (patch-pim_pim__bsr.hh) = a8876be2bcaac8c026dda04cd599175f5965b205 SHA1 (patch-pim_pim__mre__track__state.hh) = b470edf7c14a88d1f7fe4d7fa025c338b5012fae SHA1 (patch-pim_pim__scope__zone__table.hh) = fabc82917d4fb88c27a47409957632bfb9172d3b SHA1 (patch-pim_pim__vif.cc) = 922e9b502e8e0622efb1d63621aeec3ab2265549 +SHA1 (patch-pim_xrl__pim__node.hh) = 51fb61d911f7b5c98b1be194781dbd18c11ec48d SHA1 (patch-policy_backend_backend.l) = 07bc0c71dafa4e3fd91e8825a3322342b60f20a7 SHA1 (patch-policy_backend_iv__exec.cc) = de92d8103c6921c6c530539aa2d3e6526bd222e2 SHA1 (patch-policy_backend_policytags.hh) = 22f31e64c162435be5de5885c56292cca5395fe9 SHA1 (patch-policy_backend_single__varrw.cc) = 84fc7c9ffdb79401fc469b46fa24f9e418d8b278 +SHA1 (patch-policy_common_element.cc) = 3d72e8e30cf30c7a4f69e62d3fcaaf86b66a6075 SHA1 (patch-policy_policy.l) = 7344e2152bb9325ed843edc1a98097f5bd6ba7e7 SHA1 (patch-policy_test_compilepolicy.l) = 7c2985af63524c669d9bb3781457c8cc53359903 SHA1 (patch-rib_redist__xrl.cc) = ae886ad350b9e9e779bf8220be4e262df8c673a9 @@ -74,6 +82,7 @@ SHA1 (patch-rib_rt__tab__pol__conn.cc) = bf8ab3155ad1ecdab7b034b1aa62887a2d24842 SHA1 (patch-rib_rt__tab__pol__redist.cc) = 494a477dad76bf725a745cef15d54625da4560e0 SHA1 (patch-rib_rt__tab__redist.cc) = e4ec537e2353d4bde70ad3a3ef637b3c7f8af0ff SHA1 (patch-rip_auth.cc) = 53dd12a160a24922db5dd7033319bdde0d46cb62 +SHA1 (patch-rip_output.hh) = 2ec60ca7a8a08359994afa7199a771f6e39b27e2 SHA1 (patch-rip_output__table.cc) = c0fd4f05e87ac857280c6e81e7adf4e51d961cf0 SHA1 (patch-rip_output__updates.cc) = d43fa6eabd3413bb7e221a565c6f250305c29292 SHA1 (patch-rip_packets.hh) = c15d74e809ce5572b1cbd90f5af59817d5e70698 diff --git a/net/xorp/patches/patch-fea_data__plane_io_io__ip__socket.cc b/net/xorp/patches/patch-fea_data__plane_io_io__ip__socket.cc index 8ba90ac701e..5045ed59337 100644 --- a/net/xorp/patches/patch-fea_data__plane_io_io__ip__socket.cc +++ b/net/xorp/patches/patch-fea_data__plane_io_io__ip__socket.cc @@ -1,7 +1,16 @@ -$NetBSD: patch-fea_data__plane_io_io__ip__socket.cc,v 1.1 2013/08/30 22:40:00 joerg Exp $ +$NetBSD: patch-fea_data__plane_io_io__ip__socket.cc,v 1.2 2020/04/17 00:20:45 joerg Exp $ ---- fea/data_plane/io/io_ip_socket.cc.orig 2013-08-30 21:41:39.000000000 +0000 +--- fea/data_plane/io/io_ip_socket.cc.orig 2009-01-05 18:30:54.000000000 +0000 +++ fea/data_plane/io/io_ip_socket.cc +@@ -2022,7 +2022,7 @@ IoIpSocket::send_packet(const string& if + // + struct sockaddr_in sin; + src_address.copy_out(sin); +- if (bind(_proto_socket_out, ++ if (::bind(_proto_socket_out, + reinterpret_cast<struct sockaddr*>(&sin), + sizeof(sin)) + < 0) { @@ -2068,7 +2068,7 @@ IoIpSocket::send_packet(const string& if #endif diff --git a/net/xorp/patches/patch-fea_io__ip__manager.hh b/net/xorp/patches/patch-fea_io__ip__manager.hh new file mode 100644 index 00000000000..8a0ab5e7b83 --- /dev/null +++ b/net/xorp/patches/patch-fea_io__ip__manager.hh @@ -0,0 +1,16 @@ +$NetBSD: patch-fea_io__ip__manager.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $ + +--- fea/io_ip_manager.hh.orig 2020-04-16 14:48:26.391011767 +0000 ++++ fea/io_ip_manager.hh +@@ -22,6 +22,11 @@ + #ifndef __FEA_IO_IP_MANAGER_HH__ + #define __FEA_IO_IP_MANAGER_HH__ + ++#ifdef __NetBSD__ ++#include <net/if.h> ++#undef if_name ++#endif ++ + #include <list> + #include <vector> + #include <set> diff --git a/net/xorp/patches/patch-fea_io__link.hh b/net/xorp/patches/patch-fea_io__link.hh new file mode 100644 index 00000000000..662b2828d48 --- /dev/null +++ b/net/xorp/patches/patch-fea_io__link.hh @@ -0,0 +1,16 @@ +$NetBSD: patch-fea_io__link.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $ + +--- fea/io_link.hh.orig 2020-04-16 14:47:26.780539843 +0000 ++++ fea/io_link.hh +@@ -23,6 +23,11 @@ + #ifndef __FEA_IO_LINK_HH__ + #define __FEA_IO_LINK_HH__ + ++#ifdef __NetBSD__ ++#include <net/if.h> ++#undef if_name ++#endif ++ + #include <vector> + + #include "fea_data_plane_manager.hh" diff --git a/net/xorp/patches/patch-libxipc_finder__msgs.cc b/net/xorp/patches/patch-libxipc_finder__msgs.cc new file mode 100644 index 00000000000..a41dfc1dab1 --- /dev/null +++ b/net/xorp/patches/patch-libxipc_finder__msgs.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-libxipc_finder__msgs.cc,v 1.1 2020/04/17 00:20:45 joerg Exp $ + +--- libxipc/finder_msgs.cc.orig 2020-04-16 14:37:03.894247926 +0000 ++++ libxipc/finder_msgs.cc +@@ -228,8 +228,8 @@ ParsedFinderXrlResponse::ParsedFinderXrl + : ParsedFinderMessageBase(data, FinderXrlResponse::c_type), _xrl_args(0) + { + data += bytes_parsed(); +- char* p0 = strstr(data, "/"); +- char* p1 = strstr(data, "\n"); ++ const char* p0 = strstr(data, "/"); ++ const char* p1 = strstr(data, "\n"); + if (p0 == 0 || p1 == 0) { + xorp_throw(BadFinderMessageFormat, "XrlError not present"); + } diff --git a/net/xorp/patches/patch-libxipc_xrl__pf__factory.cc b/net/xorp/patches/patch-libxipc_xrl__pf__factory.cc new file mode 100644 index 00000000000..7352f90a9f0 --- /dev/null +++ b/net/xorp/patches/patch-libxipc_xrl__pf__factory.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-libxipc_xrl__pf__factory.cc,v 1.1 2020/04/17 00:20:45 joerg Exp $ + +--- libxipc/xrl_pf_factory.cc.orig 2020-04-16 14:37:52.151875483 +0000 ++++ libxipc/xrl_pf_factory.cc +@@ -69,7 +69,7 @@ XrlPFSender* + XrlPFSenderFactory::create_sender(EventLoop& eventloop, + const char* protocol_colon_address) + { +- char *colon = strstr(protocol_colon_address, ":"); ++ const char *colon = strstr(protocol_colon_address, ":"); + if (colon == 0) { + debug_msg("No colon in supposedly colon separated <protocol><address>" + "combination\n\t\"%s\".\n", protocol_colon_address); diff --git a/net/xorp/patches/patch-libxorp_ipnet.hh b/net/xorp/patches/patch-libxorp_ipnet.hh index e71bea982e1..54d825e0d47 100644 --- a/net/xorp/patches/patch-libxorp_ipnet.hh +++ b/net/xorp/patches/patch-libxorp_ipnet.hh @@ -1,6 +1,6 @@ -$NetBSD: patch-libxorp_ipnet.hh,v 1.1 2013/06/13 21:48:09 joerg Exp $ +$NetBSD: patch-libxorp_ipnet.hh,v 1.2 2020/04/17 00:20:45 joerg Exp $ ---- libxorp/ipnet.hh.orig 2013-06-13 18:24:26.000000000 +0000 +--- libxorp/ipnet.hh.orig 2009-01-05 18:30:57.000000000 +0000 +++ libxorp/ipnet.hh @@ -107,6 +107,10 @@ public: (masked_addr() == other.masked_addr())); @@ -13,3 +13,19 @@ $NetBSD: patch-libxorp_ipnet.hh,v 1.1 2013/06/13 21:48:09 joerg Exp $ /** * Less-than comparison for subnets (see body for description). * +@@ -563,13 +567,13 @@ template <class A> void + IPNet<A>::initialize_from_string(const char *cp) + throw (InvalidString, InvalidNetmaskLength) + { +- char *slash = strrchr(cp, '/'); ++ const char *slash = strrchr(cp, '/'); + if (slash == 0) + xorp_throw(InvalidString, "Missing slash"); + + if (*(slash + 1) == 0) + xorp_throw(InvalidString, "Missing prefix length"); +- char *n = slash + 1; ++ const char *n = slash + 1; + while (*n != 0) { + if (*n < '0' || *n > '9') { + xorp_throw(InvalidString, "Bad prefix length"); diff --git a/net/xorp/patches/patch-libxorp_ipvxnet.hh b/net/xorp/patches/patch-libxorp_ipvxnet.hh new file mode 100644 index 00000000000..e0f362d421e --- /dev/null +++ b/net/xorp/patches/patch-libxorp_ipvxnet.hh @@ -0,0 +1,13 @@ +$NetBSD: patch-libxorp_ipvxnet.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $ + +--- libxorp/ipvxnet.hh.orig 2020-04-16 14:35:42.344739235 +0000 ++++ libxorp/ipvxnet.hh +@@ -54,7 +54,7 @@ inline void + IPNet<IPvX>::initialize_from_string(const char *cp) + throw (InvalidString, InvalidNetmaskLength) + { +- char *slash = strrchr(cp, '/'); ++ const char *slash = strrchr(cp, '/'); + if (slash == 0) xorp_throw(InvalidString, "Missing slash"); + + if (*(slash + 1) == 0) diff --git a/net/xorp/patches/patch-mld6igmp_xrl__mld6igmp__node.hh b/net/xorp/patches/patch-mld6igmp_xrl__mld6igmp__node.hh new file mode 100644 index 00000000000..83b0e0b87d3 --- /dev/null +++ b/net/xorp/patches/patch-mld6igmp_xrl__mld6igmp__node.hh @@ -0,0 +1,15 @@ +$NetBSD: patch-mld6igmp_xrl__mld6igmp__node.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $ + +--- mld6igmp/xrl_mld6igmp_node.hh.orig 2020-04-16 15:02:53.721761291 +0000 ++++ mld6igmp/xrl_mld6igmp_node.hh +@@ -22,6 +22,10 @@ + #ifndef __MLD6IGMP_XRL_MLD6IGMP_NODE_HH__ + #define __MLD6IGMP_XRL_MLD6IGMP_NODE_HH__ + ++#ifdef __NetBSD__ ++#include <net/if.h> ++#undef if_name ++#endif + + // + // MLD6IGMP XRL-aware node definition. diff --git a/net/xorp/patches/patch-pim_xrl__pim__node.hh b/net/xorp/patches/patch-pim_xrl__pim__node.hh new file mode 100644 index 00000000000..f6d25df9fd9 --- /dev/null +++ b/net/xorp/patches/patch-pim_xrl__pim__node.hh @@ -0,0 +1,15 @@ +$NetBSD: patch-pim_xrl__pim__node.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $ + +--- pim/xrl_pim_node.hh.orig 2020-04-16 15:10:54.106155087 +0000 ++++ pim/xrl_pim_node.hh +@@ -22,6 +22,10 @@ + #ifndef __PIM_XRL_PIM_NODE_HH__ + #define __PIM_XRL_PIM_NODE_HH__ + ++#ifdef __NetBSD__ ++#include <net/if.h> ++#undef if_name ++#endif + + // + // PIM XRL-aware node definition. diff --git a/net/xorp/patches/patch-policy_common_element.cc b/net/xorp/patches/patch-policy_common_element.cc new file mode 100644 index 00000000000..82e89e3676f --- /dev/null +++ b/net/xorp/patches/patch-policy_common_element.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-policy_common_element.cc,v 1.1 2020/04/17 00:20:45 joerg Exp $ + +--- policy/common/element.cc.orig 2020-04-16 14:40:39.438101634 +0000 ++++ policy/common/element.cc +@@ -89,7 +89,7 @@ ElemCom32::ElemCom32(const char* c_str) + } + + int len = strlen(c_str); +- char *colon = strstr(c_str, ":"); ++ const char *colon = strstr(c_str, ":"); + + if(len > 0 && colon != NULL) { + uint32_t msw, lsw; diff --git a/net/xorp/patches/patch-rip_output.hh b/net/xorp/patches/patch-rip_output.hh new file mode 100644 index 00000000000..dcb428f8caf --- /dev/null +++ b/net/xorp/patches/patch-rip_output.hh @@ -0,0 +1,13 @@ +$NetBSD: patch-rip_output.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $ + +--- rip/output.hh.orig 2020-04-16 15:12:16.319176979 +0000 ++++ rip/output.hh +@@ -93,7 +93,7 @@ public: + /** + * Get number of packets placed on packet queue for output. + */ +- void packets_sent() const { return _pkts_out; } ++ void packets_sent() const { return; } + + protected: + /** |