From a1531a56e3668352279e04ebd1c85907d9eb0c29 Mon Sep 17 00:00:00 2001
From: Damien Stuart <dstart@dstuart.org>
Date: Mon, 5 Jul 2010 02:18:44 +0000
Subject: [PATCH] Due to issues and usage restrictions on whatismyip.com, I am
 making the default resolve_ip_http url www.cipherdyne.org/cgi-bin/myip.

git-svn-id: file:///home/mbr/svn/fwknop/trunk@233 510a4753-2344-4c79-9c09-4d669213fbeb
---
 client/config_init.c   | 104 +----------------------------------------
 client/fwknop_common.h |  10 ++--
 2 files changed, 8 insertions(+), 106 deletions(-)

diff --git a/client/config_init.c b/client/config_init.c
index a0327341..df1e3633 100644
--- a/client/config_init.c
+++ b/client/config_init.c
@@ -29,49 +29,6 @@
 #include "utils.h"
 #include "ctype.h"
 
-/* Routine to extract the configuration value from a line in the config
- * file.
-*/
-int
-get_char_val(const char *var_name, char *dest, char *lptr)
-{
-    int i, var_char_ctr = 0;
-    char *tmp_ptr;
-
-    tmp_ptr = lptr;
-
-    /* var_name is guaranteed to be NULL-terminated.
-    */
-    for (i=0; i < (int)strlen(var_name); i++)
-        if (tmp_ptr[i] != var_name[i])
-            return 0;
-
-    tmp_ptr += i;
-
-    /* First char after varName better be a space or tab  or '='.
-    */
-    if (*tmp_ptr != ' ' && *tmp_ptr != '\t' && *tmp_ptr != '=')
-        return 0;
-
-    /* Walk past the delimiter.
-    */
-    while (*tmp_ptr == ' ' || *tmp_ptr == '\t' || *tmp_ptr == '=')
-        tmp_ptr++;
-
-    while (var_char_ctr < MAX_LINE_LEN && tmp_ptr[var_char_ctr] != '\n'
-            && tmp_ptr[var_char_ctr] != '\0')
-        var_char_ctr++;
-
-    if (tmp_ptr[var_char_ctr] != '\n' || var_char_ctr >= MAX_LINE_LEN)
-        return 0;
-
-    strncpy(dest, tmp_ptr, var_char_ctr);
-
-    dest[var_char_ctr] = '\0';
-
-    return 1;
-}
-
 /* Parse any time offset from the command line
 */
 static int
@@ -122,62 +79,6 @@ parse_time_offset(char *offset_str)
     return offset;
 }
 
-/* Parse the config file...
-*/
-static void
-parse_config_file(fko_cli_options_t *options, struct opts_track* ot)
-{
-    FILE           *cfile_ptr;
-    unsigned int    numLines = 0;
-
-    char            conf_line_buf[MAX_LINE_LEN] = {0};
-    char            tmp_char_buf[MAX_LINE_LEN]  = {0};
-    char           *lptr;
-
-    struct stat     st;
-
-    /* First see if the config file exists.  If it doesn't, and was
-     * specified via command-line, then error out.  Otherwise, complain
-     * and go on with program defaults.
-    */
-    if(stat(options->config_file, &st) != 0)
-    {
-        fprintf(stderr,
-            "** Config file was not found. Attempting to continue with defaults...\n"
-        );
-
-        return;
-    }
-
-    if ((cfile_ptr = fopen(options->config_file, "r")) == NULL)
-    {
-        fprintf(stderr, "[*] Could not open config file: %s\n",
-                options->config_file);
-        exit(EXIT_FAILURE);
-    }
-
-    while ((fgets(conf_line_buf, MAX_LINE_LEN, cfile_ptr)) != NULL)
-    {
-        numLines++;
-        conf_line_buf[MAX_LINE_LEN-1] = '\0';
-        lptr = conf_line_buf;
-
-        memset(tmp_char_buf, 0x0, MAX_LINE_LEN);
-
-        while (*lptr == ' ' || *lptr == '\t' || *lptr == '=')
-            lptr++;
-
-        /* Get past comments and empty lines.
-        */
-        if (*lptr == '#' || *lptr == '\n' || *lptr == '\r' || *lptr == '\0' || *lptr == ';')
-            continue;
-    }
-
-    fclose(cfile_ptr);
-
-    return;
-}
-
 /* Sanity and bounds checks for the various options.
 */
 static void
@@ -468,10 +369,7 @@ usage(void)
       " -Q, --spoof-source          Set the source IP for outgoing SPA packet.\n"
       " -R, --resolve-ip-http       Resolve the external network IP by\n"
       "                             connecting to the URL:\n"
-      "                             http://"
-      HTTP_RESOLVE_HOST
-      HTTP_RESOLVE_URL
-      "\n"
+      "                             http://" HTTP_RESOLVE_HOST HTTP_RESOLVE_URL "\n"
       " -u, --user-agent            Set the HTTP User-Agent for resolving the\n"
       "                             external IP via -R, or for sending SPA\n"
       "                             packets over HTTP.\n"
diff --git a/client/fwknop_common.h b/client/fwknop_common.h
index ae5f43d7..c55f5ac6 100644
--- a/client/fwknop_common.h
+++ b/client/fwknop_common.h
@@ -51,9 +51,14 @@
 
 /* For resolving the allow IP via HTTP and sending SPA packets over
  * HTTP -  http://www.whatismyip.com/automation/n09230945.asp 
+    #define HTTP_RESOLVE_HOST          "www.whatismyip.com"
+    #define HTTP_RESOLVE_URL           "/automation/n09230945.asp"
+  * --DSS Note: The whatismyip.com site has some usage restrictions.
+  *             so we will make the default run on cipherdyne website
+  *             for now.
 */
-#define HTTP_RESOLVE_HOST          "www.whatismyip.com"
-#define HTTP_RESOLVE_URL           "/automation/n09230945.asp"
+#define HTTP_RESOLVE_HOST          "www.cipherdyne.org"
+#define HTTP_RESOLVE_URL           "/cgi-bin/myip"
 #define HTTP_MAX_REQUEST_LEN       2000
 #define HTTP_MAX_RESPONSE_LEN      2000
 #define HTTP_MAX_USER_AGENT_LEN    50
@@ -106,7 +111,6 @@ typedef struct fko_cli_options
     unsigned int digest_type;
 
     /* Various command-line flags */
-    unsigned char   quiet;   /* --quiet mode */
     unsigned char   verbose; /* --verbose mode */
     unsigned char   version; /* --version */
     unsigned char   no_save;