* Added host/IP and port to node config (client side only)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index c14bea3b6e542d2a1da281c54a3645fb5afe2992..f83a5c55846e4b7bab39abfdf77a5c19d9d22a5a 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 580.44  2001/09/18 04:05:04  ajc
+ * Added host/IP and port to node config (client side only)
+
  Revision 580.43  2001/09/17 23:55:45  ajc
  * Support for IGnet routing (not tested)
 
@@ -2748,3 +2751,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/messages/goodbye b/citadel/messages/goodbye
index 5b36793b9207520a41d633d95404259b720e3488..654807543b804c49753d1e91266c519b8034158d 100644 (file)
--- a/citadel/messages/goodbye
+++ b/citadel/messages/goodbye
@@ -3,5 +3,5 @@
  
  Thanks for calling ^humannode - please call again soon!
  
- Also be sure to visit UNCENSORED! BBS at uncnsrd.mt-kisco.ny.us
+ Also be sure to visit UNCENSORED! BBS at uncensored.citadel.org
 

diff --git a/citadel/public_clients b/citadel/public_clients
index 504890c43d32dd95f4f80f0dcdef87c24fbdc76e..133e8eaebd674e9119cae441620a7e9d08c4ff6c 100644 (file)
--- a/citadel/public_clients
+++ b/citadel/public_clients
@@ -7,3 +7,6 @@
 
 localhost
 127.0.0.1
+db01
+web01
+web02

diff --git a/citadel/routines2.c b/citadel/routines2.c
index df306feee240f709462268304ecb71ed2ac03d41..7d23e9bb6e97e5495e7c26e1d97813b0a0dd63ed 100644 (file)
--- a/citadel/routines2.c
+++ b/citadel/routines2.c
@@ -1050,13 +1050,17 @@ void do_ignet_configuration(void) {
        do {
                printf("\n");
                color(BRIGHT_WHITE);
-               printf("### ");
-               printf("    Node         ");
-               printf("   Secret           \n");
+               printf( "### "
+                       "   Node          "
+                       "  Secret         "
+                       "          Host or IP             "
+                       "Port#\n");
                color(DIM_WHITE);
-               printf("--- ");
-               printf("---------------- ");
-               printf("--------------------\n");
+               printf( "--- "
+                       "---------------- "
+                       "---------------- "
+                       "-------------------------------- "
+                       "-----\n");
                for (i=0; i<num_recs; ++i) {
                color(DIM_WHITE);
                printf("%3d ", i+1);
@@ -1065,7 +1069,13 @@ void do_ignet_configuration(void) {
                printf("%-16s ", buf);
                extract(buf, recs[i], 1);
                color(BRIGHT_MAGENTA);
-               printf("%-16s\n", buf);
+               printf("%-16s ", buf);
+               extract(buf, recs[i], 2);
+               color(BRIGHT_CYAN);
+               printf("%-32s ", buf);
+               extract(buf, recs[i], 3);
+               color(BRIGHT_MAGENTA);
+               printf("%-3s\n", buf);
                color(DIM_WHITE);
                }
 
@@ -1077,10 +1087,16 @@ void do_ignet_configuration(void) {
                                        recs = malloc(sizeof(char *));
                                else recs = realloc(recs,
                                        (sizeof(char *)) * num_recs);
-                               newprompt("Enter host name    : ", buf, 16);
+                               newprompt("Enter node name    : ", buf, 16);
                                strcat(buf, "|");
                                newprompt("Enter shared secret: ",
                                        &buf[strlen(buf)], 16);
+                               strcat(buf, "|");
+                               newprompt("Enter host or IP   : ",
+                                       &buf[strlen(buf)], 32);
+                               strcat(buf, "|504");
+                               strprompt("Enter port number  : ",
+                                       &buf[strlen(buf)-3], 5);
                                recs[num_recs-1] = strdup(buf);
                                break;
                        case 'd':