Be more careful when trying to get the local and destination IP addresses

and wait a bit more time on NetBSD for pppd to start.

3 files changed, 74 insertions, 1 deletions

diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo
index e4dffbd2f9e..3220f26922a 100644
--- a/net/kdenetwork2/distinfo
+++ b/net/kdenetwork2/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.6 2001/12/03 15:37:17 skrll Exp $
+$NetBSD: distinfo,v 1.7 2001/12/13 00:58:31 skrll Exp $
 
 SHA1 (kdenetwork-2.2.2.tar.bz2) = 2f29ebd72fbb9f8c8ae21e092cc9b89e7f2ebab2
 Size (kdenetwork-2.2.2.tar.bz2) = 3168454 bytes
+SHA1 (patch-aa) = 2d189779c1bcd3059ada271c7b87ec5bf5f403e4
 SHA1 (patch-ab) = 38f731b7e8e50a703a4d1a3a46820c03fa0f1b9d
 SHA1 (patch-ac) = db243a2ef536d7967dc43a9eba3ba7e2aaf7349f
 SHA1 (patch-ad) = db3ad0f88fb91976c6388ec017852e0b3502422d
 SHA1 (patch-ae) = 1880a2861f908f39091924eef003b4548e8cd457
+SHA1 (patch-af) = 56bc4a8e67a976215866fa3c52e31c5bafb86236
diff --git a/net/kdenetwork2/patches/patch-aa b/net/kdenetwork2/patches/patch-aa
new file mode 100644
index 00000000000..c6d68a2847d
--- /dev/null
+++ b/net/kdenetwork2/patches/patch-aa
@@ -0,0 +1,49 @@
+$NetBSD: patch-aa,v 1.3 2001/12/13 00:58:31 skrll Exp $
+
+--- kppp/pppstats.cpp.orig	Sun Dec  2 09:48:05 2001
++++ kppp/pppstats.cpp
+@@ -208,27 +208,29 @@
+ 
+   strcpy(ifr.ifr_name, unitName);
+ 
++  local_ip_address = "";
+   if (ioctl(s, SIOCGIFADDR, &ifr) < 0) {
+-  }
++    kdDebug(5002) << "Cannot get ip address" << endl;
++  } else {
++    sinp = (struct sockaddr_in*)&ifr.ifr_addr;
+ 
+-  sinp = (struct sockaddr_in*)&ifr.ifr_addr;
++    if(sinp->sin_addr.s_addr)
++      local_ip_address = inet_ntoa(sinp->sin_addr);
+ 
+-  if(sinp->sin_addr.s_addr)
+-    local_ip_address = inet_ntoa(sinp->sin_addr);
+-  else
+-    local_ip_address = "";
+-  kdDebug(5002) << "Local IP: " << local_ip_address << endl;
++    kdDebug(5002) << "Local IP: " << local_ip_address << endl;
++  }
+ 
+-  if (ioctl(s, SIOCGIFDSTADDR, &ifr) < 0)
+-    ;
++  remote_ip_address = "";
++  if (ioctl(s, SIOCGIFDSTADDR, &ifr) < 0) {
++    kdDebug(5002) << "Cannot get remote ip address" << endl;
++  } else {
++    sinp = (struct sockaddr_in*)&ifr.ifr_dstaddr;
+ 
+-  sinp = (struct sockaddr_in*)&ifr.ifr_dstaddr;
++    if(sinp->sin_addr.s_addr)
++      remote_ip_address = inet_ntoa(sinp->sin_addr);
+ 
+-  if(sinp->sin_addr.s_addr)
+-    remote_ip_address = inet_ntoa(sinp->sin_addr);
+-  else
+-    remote_ip_address = "";
+-  kdDebug(5002) << "Remote IP: " << remote_ip_address << endl;
++    kdDebug(5002) << "Remote IP: " << remote_ip_address << endl;
++  }
+ 
+   return true;
+ 
diff --git a/net/kdenetwork2/patches/patch-af b/net/kdenetwork2/patches/patch-af
new file mode 100644
index 00000000000..60afafa682e
--- /dev/null
+++ b/net/kdenetwork2/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2001/12/13 00:58:32 skrll Exp $
+
+--- kppp/connect.cpp.orig	Wed Nov 14 01:34:56 2001
++++ kppp/connect.cpp
+@@ -1048,10 +1048,16 @@
+   }
+ 
+   // O.K the ppp interface is up and running
+-  // give it a few time to come up completly (0.2 seconds)
++  // give it a bit of time to come up completely
+   if_timeout_timer->stop();
+   if_timer->stop();
++
++  // NetBSD seems to need more time for pppd to come up
++#ifdef __NetBSD__
++  sleep(2);
++#else
+   usleep(200000);
++#endif
+ 
+   if(gpppdata.autoDNS())
+     addpeerdns();