From 9283a3f859bbd3628389f0b9f6c4911c2792078b Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Thu, 31 Oct 2002 20:54:20 +0000
Subject: [PATCH] Removed phone override fields for IP connections

---
 ChangeLog             |  2 ++
 html/setup/nodes.html |  4 ++--
 mbcico/call.c         | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7591f8c1..8ccab168 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@ v0.35.05	19-Oct-2002
 
 	mbcico:
 		Fixed crash with incoming YooHoo session with bad password.
+		Still used the phone override fields for hostname override
+		with internet calls if there was something filled in.
 
 	mbout:
 		The stat command now also shows what is on hold for a node
diff --git a/html/setup/nodes.html b/html/setup/nodes.html
index c1c4cf00..436f946e 100644
--- a/html/setup/nodes.html
+++ b/html/setup/nodes.html
@@ -91,9 +91,9 @@ session password.</td></tr>
 override here for the normal dial command. If you leave this empty the command
 from the modem setup is used.</td></tr>
 <tr><th nowrap align=left valign=top>Phone number 1</th><td>An alternative phone
-number/ip address to dial.</td></tr>
+number to dial.</td></tr>
 <tr><th nowrap align=left valign=top>Phone number 2</th><td>An alternative phone
-number/ip address to dial.  Use these above commands if the node has another
+number to dial.  Use these above commands if the node has another
 phone number as mentioned in the nodelist.</td></tr>
 <tr><th nowrap align=left valign=top>Nodelist flags</th><td>Override for the
 nodelist flags, the nodelist flags are completly ignored if you enter something
diff --git a/mbcico/call.c b/mbcico/call.c
index 448e10c8..52ff3a38 100644
--- a/mbcico/call.c
+++ b/mbcico/call.c
@@ -158,11 +158,11 @@ int call(faddr *addr)
 	     * There is no fdn or IP address at the commandline.
 	     * First check nodesetup for an override in the phone field.
 	     */
-	    if (strlen(nodes.phone[0])) {
-		inetaddr = xstrcpy(nodes.phone[0]);
-	    } else if (strlen(nodes.phone[1])) {
-		inetaddr = xstrcpy(nodes.phone[1]);
-	    } else {
+//	    if (strlen(nodes.phone[0])) {
+//		inetaddr = xstrcpy(nodes.phone[0]);
+//	    } else if (strlen(nodes.phone[1])) {
+//		inetaddr = xstrcpy(nodes.phone[1]);
+//	    } else {
 		/*
 		 * Try to find the fdn in several places in the nodelist fields.
 		 */
@@ -183,7 +183,7 @@ int call(faddr *addr)
 		    inetaddr = xstrcpy(nlent->location);
 		    Syslog('d', "Got hostname from nodelist location");
 		}
-	    }
+//	    }
 	}
 
 	/*