pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/paris-traceroute Rename log to mylog to avoid conf...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0a69a6745a5b
branches: trunk
changeset: 426199:0a69a6745a5b
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Mar 27 20:52:19 2020 +0000
description:
Rename log to mylog to avoid conflict with math.h.
diffstat:
net/paris-traceroute/distinfo | 34 +-
net/paris-traceroute/patches/patch-src_ConcurrentTracert.cc | 21 +
net/paris-traceroute/patches/patch-src_ExhaustiveOldTracert.cc | 31 +
net/paris-traceroute/patches/patch-src_ExhaustiveTracert.cc | 53 ++
net/paris-traceroute/patches/patch-src_HopByHopTracert.cc | 21 +
net/paris-traceroute/patches/patch-src_ICMPDestUnreachable.cc | 26 +
net/paris-traceroute/patches/patch-src_ICMPEcho.cc | 22 +
net/paris-traceroute/patches/patch-src_ICMPHeader.cc | 32 +
net/paris-traceroute/patches/patch-src_ICMPProbe.cc | 26 +
net/paris-traceroute/patches/patch-src_ICMPReply.cc | 98 +++++
net/paris-traceroute/patches/patch-src_ICMPTimeExceeded.cc | 26 +
net/paris-traceroute/patches/patch-src_IP4Header.cc | 37 ++
net/paris-traceroute/patches/patch-src_IP4Header__NetBSD.cc | 37 ++
net/paris-traceroute/patches/patch-src_MPLSHeader.cc | 49 ++
net/paris-traceroute/patches/patch-src_MihScannerTracert.cc | 21 +
net/paris-traceroute/patches/patch-src_NULLTracert.cc | 13 +
net/paris-traceroute/patches/patch-src_Options.cc | 158 ++++++++
net/paris-traceroute/patches/patch-src_PackByPackTracert.cc | 30 +
net/paris-traceroute/patches/patch-src_Reply.cc | 18 +
net/paris-traceroute/patches/patch-src_ScoutTracert.cc | 12 +
net/paris-traceroute/patches/patch-src_Server.cc | 83 ++++
net/paris-traceroute/patches/patch-src_TCPHeader.cc | 50 ++
net/paris-traceroute/patches/patch-src_TCPProbe.cc | 26 +
net/paris-traceroute/patches/patch-src_TCPReply.cc | 44 ++
net/paris-traceroute/patches/patch-src_TracertImpl.cc | 185 ++++++++++
net/paris-traceroute/patches/patch-src_UDPHeader.cc | 21 +
net/paris-traceroute/patches/patch-src_UDPProbe.cc | 35 +
net/paris-traceroute/patches/patch-src_Util.cc | 35 +-
net/paris-traceroute/patches/patch-src_Util__NetBSD.cc | 22 +
net/paris-traceroute/patches/patch-src_common.h | 22 +
net/paris-traceroute/patches/patch-src_paris-traceroute.cc | 55 ++
net/paris-traceroute/patches/patch-src_tupleroute.cc | 68 +++
32 files changed, 1408 insertions(+), 3 deletions(-)
diffs (truncated from 1551 to 300 lines):
diff -r 0978ac4bef10 -r 0a69a6745a5b net/paris-traceroute/distinfo
--- a/net/paris-traceroute/distinfo Fri Mar 27 20:51:43 2020 +0000
+++ b/net/paris-traceroute/distinfo Fri Mar 27 20:52:19 2020 +0000
@@ -1,7 +1,37 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 00:35:26 agc Exp $
+$NetBSD: distinfo,v 1.4 2020/03/27 20:52:19 joerg Exp $
SHA1 (paris-traceroute-0.92-dev.tar.gz) = 83096a5bbc58329633407db040ece2af21954f6b
RMD160 (paris-traceroute-0.92-dev.tar.gz) = 05fb22f0d8138950eb73ab69adf3c2d2cb50ff03
SHA512 (paris-traceroute-0.92-dev.tar.gz) = ecae447bb3f811f5668d2beb24fb0146e9267189e14c10b09fe930daad552e97dbcde7208be6020c83b3560b41395a866a87d4076e6ce6c5d574490a9e0d9128
Size (paris-traceroute-0.92-dev.tar.gz) = 1063191 bytes
-SHA1 (patch-src_Util.cc) = a46a3318bf8fd5325bf62f1040370f525824e034
+SHA1 (patch-src_ConcurrentTracert.cc) = 411c26a3599056908e92b54e5bb553f1bd1569af
+SHA1 (patch-src_ExhaustiveOldTracert.cc) = 3b726ea4894b6753d87631db48eeaf31c853f967
+SHA1 (patch-src_ExhaustiveTracert.cc) = 41171f5789d5700cd84e263ba508295b26c912b0
+SHA1 (patch-src_HopByHopTracert.cc) = 756aeb7db69aaa04165aad3b27ed5531331a3d51
+SHA1 (patch-src_ICMPDestUnreachable.cc) = ade361797bbf4b256d43a3462e29bae0326d7ed6
+SHA1 (patch-src_ICMPEcho.cc) = d74e1a011520249888a5cb1bc1de0bc65576016c
+SHA1 (patch-src_ICMPHeader.cc) = 8f859cb9938669a15ce16dede5efb90aa6b0eab6
+SHA1 (patch-src_ICMPProbe.cc) = 598eb55d84fb9f53091b14eb13ebacaec44f3bb2
+SHA1 (patch-src_ICMPReply.cc) = cb01a8d300784cedb555917ac766ed0285aee7ac
+SHA1 (patch-src_ICMPTimeExceeded.cc) = 21192c307fcf635808ebafcfc1c5184d4b9c6d22
+SHA1 (patch-src_IP4Header.cc) = 116771fd348c8065409a1e77e4cfe8f296a8511b
+SHA1 (patch-src_IP4Header__NetBSD.cc) = 9b369b437493eb746f9b39176ef73494513a6856
+SHA1 (patch-src_MPLSHeader.cc) = 13f4319f321d73175781793283486ea6d4b689df
+SHA1 (patch-src_MihScannerTracert.cc) = 065f91c51fec7a041c4588b7ad59ed31398299fc
+SHA1 (patch-src_NULLTracert.cc) = d75ac4b3c91d8d774b52bf1ffc43d4540ca742e7
+SHA1 (patch-src_Options.cc) = fd8c0fdc44c140d32ee211ddf2347b7cdc5e9ac4
+SHA1 (patch-src_PackByPackTracert.cc) = 058fa4f419f6c7e7f27d3d9b0e7531c4177a813b
+SHA1 (patch-src_Reply.cc) = d5194545728f4220d16886eb3940270b868c2133
+SHA1 (patch-src_ScoutTracert.cc) = 30e5dd549f592cdee26f8174a2800b6ae42c83be
+SHA1 (patch-src_Server.cc) = 32b1a406d449b958b788bbfd3a6e7721a11701b3
+SHA1 (patch-src_TCPHeader.cc) = 98f1951db359c80d6ab55fec919c6424c6a2b486
+SHA1 (patch-src_TCPProbe.cc) = d8e62afba4a570668b225d1018a662b669c08dbf
+SHA1 (patch-src_TCPReply.cc) = 3d115dadaf1fcf4ef27391ceba0324e0c82c4ff2
+SHA1 (patch-src_TracertImpl.cc) = 7e74f90175095b4903727ff7f14634a482e4f64e
+SHA1 (patch-src_UDPHeader.cc) = ee04ffec773f790d949575ee00d9b57febd52bb8
+SHA1 (patch-src_UDPProbe.cc) = a70e18583f5e4d7f77cc60bc5b7c880a8ff4aa9a
+SHA1 (patch-src_Util.cc) = f079a15ed07ff68705f4a09be3fafa8adbe70e86
+SHA1 (patch-src_Util__NetBSD.cc) = 481daa18bcf68042cb17e4910d146f4768dcf263
+SHA1 (patch-src_common.h) = 0f71af6b6138313cf43259daa7302cf1d6744439
+SHA1 (patch-src_paris-traceroute.cc) = 84b8b096628f9356b66360f5372ca77091787804
+SHA1 (patch-src_tupleroute.cc) = 3507e5c3902964f2afa6ce5d8103467a4d62f30e
diff -r 0978ac4bef10 -r 0a69a6745a5b net/paris-traceroute/patches/patch-src_ConcurrentTracert.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/paris-traceroute/patches/patch-src_ConcurrentTracert.cc Fri Mar 27 20:52:19 2020 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_ConcurrentTracert.cc,v 1.1 2020/03/27 20:52:19 joerg Exp $
+
+--- src/ConcurrentTracert.cc.orig 2020-03-27 18:19:16.969383442 +0000
++++ src/ConcurrentTracert.cc
+@@ -19,7 +19,7 @@ ConcurrentTracert::ConcurrentTracert (Op
+
+ ttl_max = ttl;
+
+- log(INFO, "Concurrent algo");
++ mylog(INFO, "Concurrent algo");
+ }
+
+ ConcurrentTracert::~ConcurrentTracert () {
+@@ -117,6 +117,6 @@ ConcurrentTracert::getMaxTTL () {
+
+ uint8
+ ConcurrentTracert::getNbrReplies(uint8 ttl) {
+- log(WARN, "TODO");
++ mylog(WARN, "TODO");
+ return 0;
+ }
diff -r 0978ac4bef10 -r 0a69a6745a5b net/paris-traceroute/patches/patch-src_ExhaustiveOldTracert.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/paris-traceroute/patches/patch-src_ExhaustiveOldTracert.cc Fri Mar 27 20:52:19 2020 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_ExhaustiveOldTracert.cc,v 1.1 2020/03/27 20:52:19 joerg Exp $
+
+--- src/ExhaustiveOldTracert.cc.orig 2020-03-27 18:19:24.295954828 +0000
++++ src/ExhaustiveOldTracert.cc
+@@ -20,7 +20,7 @@
+ * @param opts List of options
+ */
+ ExhaustiveOldTracert::ExhaustiveOldTracert (Options* opts, bool per_dest) : TracertImpl(opts) {
+- log(INFO, "Exhaustive algo");
++ mylog(INFO, "Exhaustive algo");
+ this->per_dest = per_dest;
+ }
+
+@@ -467,7 +467,7 @@ ExhaustiveOldTracert::trace (char* targe
+ missing = (nbr_replies_received == 0) ? (missing + 1) : 0;
+
+ if (missing >= opts->max_missing) {
+- log(INFO, "Too many down hops -> stop algo");
++ mylog(INFO, "Too many down hops -> stop algo");
+ //pthread_mutex_unlock(&lock);
+ stop_algo = true;
+ }
+@@ -607,7 +607,7 @@ ExhaustiveOldTracert::notifyReply (Reply
+
+ //printf("valide!\n");
+ // The reply is OK, update the timed probe associated to it
+- log(INFO, "Valid reply, id=%x", reply->getID());
++ mylog(INFO, "Valid reply, id=%x", reply->getID());
+
+ updateInfos(tprobe, reply);
+
diff -r 0978ac4bef10 -r 0a69a6745a5b net/paris-traceroute/patches/patch-src_ExhaustiveTracert.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/paris-traceroute/patches/patch-src_ExhaustiveTracert.cc Fri Mar 27 20:52:19 2020 +0000
@@ -0,0 +1,53 @@
+$NetBSD: patch-src_ExhaustiveTracert.cc,v 1.1 2020/03/27 20:52:19 joerg Exp $
+
+--- src/ExhaustiveTracert.cc.orig 2020-03-27 18:19:26.755600510 +0000
++++ src/ExhaustiveTracert.cc
+@@ -22,7 +22,7 @@
+ * @param opts List of options
+ */
+ ExhaustiveTracert::ExhaustiveTracert (Options* opts, bool per_dest) : TracertImpl(opts) {
+- log(INFO, "Exhaustive algo");
++ mylog(INFO, "Exhaustive algo");
+ this->per_dest = per_dest;
+ }
+
+@@ -494,7 +494,7 @@ ExhaustiveTracert::trace (char* target,
+ missing = (nbr_replies_received == 0) ? (missing + 1) : 0;
+
+ if (missing >= opts->max_missing) {
+- log(INFO, "Too many down hops -> stop algo");
++ mylog(INFO, "Too many down hops -> stop algo");
+ //pthread_mutex_unlock(&lock);
+ stop_algo = true;
+ }
+@@ -626,7 +626,7 @@ ExhaustiveTracert::notifyReply (Reply* r
+
+ //printf("valide!\n");
+ // The reply is OK, update the timed probe associated to it
+- log(INFO, "Valid reply, id=%x", reply->getID());
++ mylog(INFO, "Valid reply, id=%x", reply->getID());
+
+ updateInfos(tprobe, reply);
+
+@@ -638,7 +638,7 @@ ExhaustiveTracert::notifyReply (Reply* r
+ if (tprobe->classif_expected_addr == 0) {
+ Interface* interf = add_interface(current_mprobes, tprobe->host_address_raw);
+ //if (opts->debug)
+- // log(WARN, "[%d] new interface : %s", ttl_current, tprobe->host_address);
++ // mylog(WARN, "[%d] new interface : %s", ttl_current, tprobe->host_address);
+
+ tprobe->interf = interf;
+ //printf("current_mprobes->backward_update %d\n", current_mprobes->backward_update);
+@@ -666,10 +666,10 @@ ExhaustiveTracert::notifyReply (Reply* r
+ //struct in_addr host_addr;
+ //host_addr.s_addr = tprobe->classif_expected_addr;
+ //char* host_address = inet_ntoa(host_addr);
+- log(WARN, "[%d] %s NOT per-flow, expected %s", ttl_current, tprobe->host_address, Util::my_inet_ntoa(tprobe->classif_expected_addr));
++ mylog(WARN, "[%d] %s NOT per-flow, expected %s", ttl_current, tprobe->host_address, Util::my_inet_ntoa(tprobe->classif_expected_addr));
+ }
+ }/* else {
+- log(WARN, "[%d] %s per-flow, expected %s", ttl_current, tprobe->host_address, my_inet_ntoa(tprobe->classif_expected_addr));
++ mylog(WARN, "[%d] %s per-flow, expected %s", ttl_current, tprobe->host_address, my_inet_ntoa(tprobe->classif_expected_addr));
+ }*/
+ }
+
diff -r 0978ac4bef10 -r 0a69a6745a5b net/paris-traceroute/patches/patch-src_HopByHopTracert.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/paris-traceroute/patches/patch-src_HopByHopTracert.cc Fri Mar 27 20:52:19 2020 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_HopByHopTracert.cc,v 1.1 2020/03/27 20:52:19 joerg Exp $
+
+--- src/HopByHopTracert.cc.orig 2020-03-27 18:19:29.074226888 +0000
++++ src/HopByHopTracert.cc
+@@ -104,7 +104,7 @@ HopByHopTracert::trace (char* target, in
+ missing = (nbr_replies_received == 0) ? (missing + 1) : 0;
+
+ if (missing >= opts->max_missing) {
+- log(INFO, "Too many down hops -> stop algo");
++ mylog(INFO, "Too many down hops -> stop algo");
+ //pthread_mutex_unlock(&lock);
+ stop_algo = true;
+ }
+@@ -126,6 +126,6 @@ HopByHopTracert::trace (char* target, in
+
+ uint8
+ HopByHopTracert::getNbrReplies(uint8 ttl) {
+- log(WARN, "TODO");
++ mylog(WARN, "TODO");
+ return 0;
+ }
diff -r 0978ac4bef10 -r 0a69a6745a5b net/paris-traceroute/patches/patch-src_ICMPDestUnreachable.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/paris-traceroute/patches/patch-src_ICMPDestUnreachable.cc Fri Mar 27 20:52:19 2020 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_ICMPDestUnreachable.cc,v 1.1 2020/03/27 20:52:19 joerg Exp $
+
+--- src/ICMPDestUnreachable.cc.orig 2020-03-27 18:19:31.352092281 +0000
++++ src/ICMPDestUnreachable.cc
+@@ -82,14 +82,14 @@ ICMPDestUnreachable::getHeaderLength ()
+ */
+ void
+ ICMPDestUnreachable::dump () {
+- log(DUMP, "ICMP Time Exceeded Header :\n");
+- log(DUMP, "type = %s\n", getTypeDesc());
+- log(DUMP, "code = %s\n", getCodeDesc());
+- log(DUMP, "checksum = %d\n", getChecksum());
+- log(DUMP, "bytes 4-7 = 0x%x\n", *(uint32*)(header+4));
+- log(DUMP, "Erroneous IP4 header :\n");
++ mylog(DUMP, "ICMP Time Exceeded Header :\n");
++ mylog(DUMP, "type = %s\n", getTypeDesc());
++ mylog(DUMP, "code = %s\n", getCodeDesc());
++ mylog(DUMP, "checksum = %d\n", getChecksum());
++ mylog(DUMP, "bytes 4-7 = 0x%x\n", *(uint32*)(header+4));
++ mylog(DUMP, "Erroneous IP4 header :\n");
+ ip4_err->dump();
+- log(DUMP, "Erroneous data :\n");
++ mylog(DUMP, "Erroneous data :\n");
+ dumpRawData(DUMP, data_err, 8);
+ }
+
diff -r 0978ac4bef10 -r 0a69a6745a5b net/paris-traceroute/patches/patch-src_ICMPEcho.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/paris-traceroute/patches/patch-src_ICMPEcho.cc Fri Mar 27 20:52:19 2020 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_ICMPEcho.cc,v 1.1 2020/03/27 20:52:19 joerg Exp $
+
+--- src/ICMPEcho.cc.orig 2020-03-27 18:19:34.138799353 +0000
++++ src/ICMPEcho.cc
+@@ -91,11 +91,11 @@ ICMPEcho::getHeaderLength () {
+ */
+ void
+ ICMPEcho::dump () {
+- log(DUMP, "ICMP Echo header :\n");
+- log(DUMP, "type = %s\n", getTypeDesc());
+- log(DUMP, "code = %s\n", getCodeDesc());
+- log(DUMP, "checksum = %d\n", getChecksum());
+- log(DUMP, "identifier = %d\n", getIdentifier());
+- log(DUMP, "sequence = %d\n", getSequence());
++ mylog(DUMP, "ICMP Echo header :\n");
++ mylog(DUMP, "type = %s\n", getTypeDesc());
++ mylog(DUMP, "code = %s\n", getCodeDesc());
++ mylog(DUMP, "checksum = %d\n", getChecksum());
++ mylog(DUMP, "identifier = %d\n", getIdentifier());
++ mylog(DUMP, "sequence = %d\n", getSequence());
+ }
+
diff -r 0978ac4bef10 -r 0a69a6745a5b net/paris-traceroute/patches/patch-src_ICMPHeader.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/paris-traceroute/patches/patch-src_ICMPHeader.cc Fri Mar 27 20:52:19 2020 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_ICMPHeader.cc,v 1.1 2020/03/27 20:52:19 joerg Exp $
+
+--- src/ICMPHeader.cc.orig 2020-03-27 18:19:36.461356104 +0000
++++ src/ICMPHeader.cc
+@@ -241,12 +241,12 @@ ICMPHeader::pack (uint8* data, int lengt
+ */
+ void
+ ICMPHeader::dump () {
+- log(DUMP, "ICMP Header :");
+- log(DUMP, "type = %s", getTypeDesc());
+- log(DUMP, "code = %s", getCodeDesc());
+- log(DUMP, "checksum = %d", getChecksum());
+- log(DUMP, "identifier = %d", getIdentifier());
+- log(DUMP, "sequence = %d", getSequence());
++ mylog(DUMP, "ICMP Header :");
++ mylog(DUMP, "type = %s", getTypeDesc());
++ mylog(DUMP, "code = %s", getCodeDesc());
++ mylog(DUMP, "checksum = %d", getChecksum());
++ mylog(DUMP, "identifier = %d", getIdentifier());
++ mylog(DUMP, "sequence = %d", getSequence());
+ }
+
+ /**
+@@ -254,7 +254,7 @@ ICMPHeader::dump () {
+ */
+ void
+ ICMPHeader::dumpRaw () {
+- log(DUMP, "ICMP Header :\n");
++ mylog(DUMP, "ICMP Header :\n");
+ dumpRawData(WARN, header, header_len);
+ }
+
diff -r 0978ac4bef10 -r 0a69a6745a5b net/paris-traceroute/patches/patch-src_ICMPProbe.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/paris-traceroute/patches/patch-src_ICMPProbe.cc Fri Mar 27 20:52:19 2020 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_ICMPProbe.cc,v 1.1 2020/03/27 20:52:19 joerg Exp $
+
+--- src/ICMPProbe.cc.orig 2020-03-27 18:19:38.646376189 +0000
++++ src/ICMPProbe.cc
+@@ -124,10 +124,10 @@ ICMPProbe::getID () {
+ */
+ void
+ ICMPProbe::dump () {
+- log(DUMP, "==> ICMP Probe :");
++ mylog(DUMP, "==> ICMP Probe :");
+ for (int i = 0; i < getNbrHeaders(); i++)
+ getHeader(i)->dump();
+- log(DUMP, "Data :");
++ mylog(DUMP, "Data :");
+ if (data != NULL)
+ dumpRawData(DUMP, data, data_length);
+ }
+@@ -140,7 +140,7 @@ ICMPProbe::dumpRaw () {
+ uint8* data;
Home |
Main Index |
Thread Index |
Old Index