Fix a header guard. Remove non-portable comparision to NULL iterator.

Be explicit about using the custom hash.

4 files changed, 52 insertions, 1 deletions

diff --git a/net/ns/distinfo b/net/ns/distinfo
index 9304d4bf113..9b16bcb304e 100644
--- a/net/ns/distinfo
+++ b/net/ns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2013/03/03 01:07:54 joerg Exp $
+$NetBSD: distinfo,v 1.20 2013/09/17 21:13:45 joerg Exp $
 
 SHA1 (ns-src-2.35.tar.gz) = 785d4045711d92c0042a6f8f5620d5eb74732980
 RMD160 (ns-src-2.35.tar.gz) = 197e6874b97c56819ce9a722ffab9fe80a5cfe21
@@ -26,3 +26,6 @@ SHA1 (patch-common_tclAppInit.cc) = a96791d7a4cdf9834fa2e3bf994903944f41b011
 SHA1 (patch-common_tkAppInit.cc) = c4f5bfa97a1585773443044640dac343219a4155
 SHA1 (patch-linkstate_ls.h) = 5f0fb99db398cf39e9853e7d8e8cd6536d29e44b
 SHA1 (patch-mac_mac-802_11Exr.cc) = 93e4112025b6e610e76694c6067723f77cd75b84
+SHA1 (patch-mdart_mdart__adp.cc) = 5cee0a60a5102197363f53f2ebb90ca972bc139c
+SHA1 (patch-mdart_mdart__queue.h) = 1bf4cfec755c80cb5332a234c82c72584e62863c
+SHA1 (patch-nix_nixnode.cc) = d0a1826836f5ce9d40869946e9df29d6b53d4b7f
diff --git a/net/ns/patches/patch-mdart_mdart__adp.cc b/net/ns/patches/patch-mdart_mdart__adp.cc
new file mode 100644
index 00000000000..d783cc66b63
--- /dev/null
+++ b/net/ns/patches/patch-mdart_mdart__adp.cc
@@ -0,0 +1,22 @@
+$NetBSD: patch-mdart_mdart__adp.cc,v 1.1 2013/09/17 21:13:45 joerg Exp $
+
+--- mdart/mdart_adp.cc.orig	2013-09-17 20:01:09.000000000 +0000
++++ mdart/mdart_adp.cc
+@@ -105,7 +105,7 @@ void ADP::sendDarq(nsaddr_t reqId, int r
+ #ifdef DEBUG_ADP
+ 	fprintf(stdout, "%.9f\tADP::sendDarq(%d)\t\t\tin node %d\twith address %s\n", CURRENT_TIME, reqId, mdart_->id_, bitString(mdart_->address_));
+ #endif
+-	nsaddr_t dstAdd_ = hash(reqId);
++	nsaddr_t dstAdd_ = ::hash(reqId);
+ #ifdef DEBUG_ADP
+ 	fprintf(stdout, "\tsending darq for node %s\n", bitString(dstAdd_));
+ #endif
+@@ -393,7 +393,7 @@ void ADP::sendDaup() {
+ 	fprintf(stdout, "%.9f\tMDART::sendDaup()\t\t\t\tin node %d\twith address %s\n", CURRENT_TIME, mdart_->id_, bitString(mdart_->address_));
+ //	printDHT();
+ #endif
+-	nsaddr_t dstAdd_ = hash(mdart_->id_);
++	nsaddr_t dstAdd_ = ::hash(mdart_->id_);
+ #ifdef DEBUG_ADP
+ 	fprintf(stdout, "\tsending daup for node  %s\n", bitString(dstAdd_));
+ 	mdart_->routingTable_->print();
diff --git a/net/ns/patches/patch-mdart_mdart__queue.h b/net/ns/patches/patch-mdart_mdart__queue.h
new file mode 100644
index 00000000000..47d262fd271
--- /dev/null
+++ b/net/ns/patches/patch-mdart_mdart__queue.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mdart_mdart__queue.h,v 1.1 2013/09/17 21:13:45 joerg Exp $
+
+--- mdart/mdart_queue.h.orig	2013-09-17 20:00:56.000000000 +0000
++++ mdart/mdart_queue.h
+@@ -45,7 +45,7 @@
+ 
+ 
+ #ifndef __mdart_rqueue_h__
+-#define __mdart_rqueue_h_
++#define __mdart_rqueue_h__
+ 
+ 
+ 
diff --git a/net/ns/patches/patch-nix_nixnode.cc b/net/ns/patches/patch-nix_nixnode.cc
new file mode 100644
index 00000000000..3d97e4c64e5
--- /dev/null
+++ b/net/ns/patches/patch-nix_nixnode.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-nix_nixnode.cc,v 1.1 2013/09/17 21:13:45 joerg Exp $
+
+--- nix/nixnode.cc.orig	2013-09-17 20:01:46.000000000 +0000
++++ nix/nixnode.cc
+@@ -156,8 +156,6 @@ Edge* pE;
+   if (last.first == NODE_NONE)
+     {
+       prev = m_Adj.begin();
+-      if (prev == (EdgeVec_it) NULL) // ! How can this happen?
+-        return(NodeWeight_t(NODE_NONE, 0));
+       pE = *prev;
+       if(0)printf("NextAdj returning first edge %ld\n",
+              pE->m_n);