Changeset 3919

Timestamp:

09/12/06 02:13:51 (3 years ago)

Author:

steve

Message:

tzo ddns

Files:

• src/router/httpd/modules/ddns.c (modified) (2 diffs)
• src/router/inadyn/src/dyndns.c (modified) (5 diffs)
• src/router/inadyn/src/dyndns.h (modified) (3 diffs)
• src/router/inadyn/src/inadyn_cmd.c (modified) (1 diff)
• src/router/kromo/cisco_wrt54g_en/DDNS.asp (modified) (10 diffs)
• src/router/services/ddns.c (modified) (2 diffs)
• src/router/services/defaults.c (modified) (1 diff)

src/router/httpd/modules/ddns.c

@@ -66 +66 @@
-  char *enable, *username, *passwd, *hostname, *dyndnstype, *wildcard, *custom, *conf, *url;
-  struct variable ddns_variables[] = {
-
+, "8"
-  {longname: "DDNS password", argv:ARGV ("30")},
-  }, *which;
@@ -144 +144 @@
-      snprintf (_wildcard, sizeof (_wildcard), "ddns_wildcard_%s", enable);
-    }
+  else if (atoi (enable) == 8)
+    {                           // tzo
+      snprintf (_username, sizeof (_username), "ddns_username_%s", enable);
+      snprintf (_passwd, sizeof (_passwd), "ddns_passwd_%s", enable);
+      snprintf (_hostname, sizeof (_hostname), "ddns_hostname_%s", enable);
+    }
-
-  username = websGetVar (wp, _username, NULL);

src/router/inadyn/src/dyndns.c

@@ -50 +50 @@
-static int get_req_for_noip_http_dns_server(DYN_DNS_CLIENT *p_self, int cnt,  DYNDNS_SYSTEM *p_sys_info);
-static int get_req_for_easydns_http_dns_server(DYN_DNS_CLIENT *p_self, int cnt,  DYNDNS_SYSTEM *p_sys_info);
+static int get_req_for_tzo_http_dns_server(DYN_DNS_CLIENT *p_self, int cnt,  DYNDNS_SYSTEM *p_sys_info);
-
-static BOOL is_dyndns_server_rsp_ok( DYN_DNS_CLIENT *p_self, char*p_rsp, char* p_ok_string);
@@ -56 +57 @@
-static BOOL is_zoneedit_server_rsp_ok( DYN_DNS_CLIENT *p_self, char*p_rsp, char* p_ok_string);
-static BOOL is_easydns_server_rsp_ok( DYN_DNS_CLIENT *p_self, char*p_rsp, char* p_ok_string);
+static BOOL is_tzo_server_rsp_ok( DYN_DNS_CLIENT *p_self, char*p_rsp, char* p_ok_string);
-
-DYNDNS_SYSTEM_INFO dns_system_table[] = 
@@ -119 +121 @@
-                        DYNDNS_3322_MY_DNS_SERVER, DYNDNS_3322_MY_DNS_SERVER_URL, NULL}},
-
+    {TZO_DEFAULT, 
+        {"default@tzo.com", NULL,  
+            (DNS_SYSTEM_SRV_RESPONSE_OK_FUNC)is_tzo_server_rsp_ok, 
+            (DNS_SYSTEM_REQUEST_FUNC) get_req_for_tzo_http_dns_server,
+            DYNDNS_MY_IP_SERVER, DYNDNS_MY_IP_SERVER_URL, 
+                        "cgi.tzo.com", "/webclient/signedon.html?TZOName=", ""}},
+
-    {CUSTOM_HTTP_BASIC_AUTH, 
-        {"custom@http_svr_basic_auth", NULL,  
@@ -229 +238 @@
-                );
-}
+static int get_req_for_tzo_http_dns_server(DYN_DNS_CLIENT *p_self, int cnt,  DYNDNS_SYSTEM *p_sys_info)
+{
+        (void)p_sys_info;
+        return sprintf(p_self->p_req_buffer, GENERIC_TZO_AUTH_MY_IP_REQUEST_FORMAT,
+                p_self->info.dyndns_server_url,         
+                p_self->alias_info.names[cnt].name,
+        p_self->info.credentials.my_username, 
+                p_self->info.credentials.my_password, 
+                p_self->info.my_ip_address.name,        
+                p_self->info.dyndns_server_name.name    
+                );
+}
-
-static int get_req_for_ip_server(DYN_DNS_CLIENT *p_self, void *p_specific_data)
@@ -431 +452 @@
-{
-        return (strstr(p_rsp, "NOERROR") != NULL);
+}
+
+/**
+        If we have an HTTP 302 the update wasn't good and we're being redirected
+*/
+BOOL is_tzo_server_rsp_ok( DYN_DNS_CLIENT *p_self, char*p_rsp, char* p_ok_string)
+{
+        return (strstr(p_rsp, " HTTP/1.%*c 302") == NULL);
-}
-

src/router/inadyn/src/dyndns.h

@@ -28 +28 @@
-#include "debug_if.h"
-
-
+.4
-#define DYNDNS_AGENT_NAME  "inadyn advanced/" DYNDNS_VERSION_STRING
-#define DYNDNS_EMAIL_ADDR       "software@stevehorbachuk.com"
@@ -43 +43 @@
-    NOIP_DEFAULT,
-    EASYDNS_DEFAULT,
+    TZO_DEFAULT,
-    DYNDNS_3322_DYNAMIC,
-    LAST_DNS_SYSTEM = -1
@@ -144 +145 @@
-        "User-Agent: "DYNDNS_AGENT_NAME " " DYNDNS_EMAIL_ADDR"\r\n\r\n"
-
+/** tzo doesnt encode password
+*/
+#define GENERIC_TZO_AUTH_MY_IP_REQUEST_FORMAT \
+    "GET %s%s&" \
+                "Email=%s&" \
+                "TZOKey=%s&"\
+                "IPAddress=%s "\
+         "HTTP/1.0\r\n" \
+        "Host: %s\r\n" \
+        "User-Agent: "DYNDNS_AGENT_NAME " " DYNDNS_EMAIL_ADDR"\r\n\r\n"
+
-#define DYNDNS_OK_RESPONSE      "good"
-#define DYNDNS_OK_NOCHANGE      "nochg"

src/router/inadyn/src/inadyn_cmd.c

@@ -110 +110 @@
-            "\t\t-For no-ip.com: default@no-ip.com\n"
-            "\t\t-For easydns.com: default@easydns.com\n"
+            "\t\t-For tzo.com: default@tzo.com\n"
-            "\t\t-For 3322.org: dyndns@3322.org\n"
-            "\t\t-For generic: custom@http_svr_basic_auth\n"

src/router/kromo/cisco_wrt54g_en/DDNS.asp

@@ -37 +37 @@
-                hostname = eval("F.ddns_hostname_"+F.ddns_enable.value);
-                wildcard = eval("F.ddns_wildcard_"+F.ddns_enable.value);
+        } else if(F.ddns_enable.value == 8) {
+                username = eval("F.ddns_username_"+F.ddns_enable.value);
+                passwd = eval("F.ddns_passwd_"+F.ddns_enable.value);
+                hostname = eval("F.ddns_hostname_"+F.ddns_enable.value);
-        } else if(F.ddns_enable.value == 5) {
-                username = eval("F.ddns_username_"+F.ddns_enable.value);
@@ -128 +132 @@
-                                                                                <option value="6" <% nvram_selmatch("ddns_enable", "6", "selected"); %> >3322.org</option>
-                                                                                <option value="7" <% nvram_selmatch("ddns_enable", "7", "selected"); %> >easyDNS.com</option>
+                                                                                <option value="8" <% nvram_selmatch("ddns_enable", "8", "selected"); %> >TZO.com</option>
-                                                                                <script type="text/javascript">document.write("<option value=\"5\" <% nvram_selmatch("ddns_enable", "5", "selected"); %> >" + ddns.custom + "</option>");</script>
-                                                                        </select>
@@ -140 +145 @@
-                                                                <% nvram_selmatch("ddns_enable","6","<!--"); %>
-                                                                <% nvram_selmatch("ddns_enable","7","<!--"); %>
+                                                                <% nvram_selmatch("ddns_enable","8","<!--"); %>
-                                                                <div class="setting">
-                                                                        <div class="label"><% tran("share.usrname"); %></div>
@@ -170 +176 @@
-                                                                <% nvram_selmatch("ddns_enable","6","-->"); %>
-                                                                <% nvram_selmatch("ddns_enable","7","-->"); %>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                                                <div class="setting">
-                                                                        <div class="label"><% tran("share.usrname"); %></div>
@@ -197 +205 @@
-                                                                <% nvram_selmatch("ddns_enable","6","-->"); %>
-                                                                <% nvram_selmatch("ddns_enable","7","-->"); %>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                                                <div class="setting">
-                                                                        <div class="label"><% tran("share.usrname"); %></div>
@@ -224 +234 @@
-                                                                <% nvram_selmatch("ddns_enable","6","-->"); %>
-                                                                <% nvram_selmatch("ddns_enable","7","-->"); %>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                                                <div class="setting">
-                                                                        <div class="label"><% tran("share.usrname"); %></div>
@@ -251 +263 @@
-                                                                <% nvram_selmatch("ddns_enable","6","-->"); %>
-                                                                <% nvram_selmatch("ddns_enable","7","-->"); %>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                                                <div class="setting">
-                                                                        <div class="label"><% tran("share.usrname"); %></div>
@@ -288 +302 @@
-                                                                <% nvram_selmatch("ddns_enable","5","-->"); %>
-                                                                <% nvram_selmatch("ddns_enable","7","-->"); %>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                                                <div class="setting">
-                                                                        <div class="label"><% tran("share.usrname"); %></div>
@@ -319 +335 @@
-                                                                <% nvram_selmatch("ddns_enable","5","-->"); %>
-                                                                <% nvram_selmatch("ddns_enable","6","-->"); %>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                                <div class="setting">
-                                                                        <div class="label"><% tran("ddns.system"); %></div>
@@ -362 +409 @@
-                                                                </div>
-                                                                <% nvram_invmatch("expert_mode","1","-->"); %>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                                        </fieldset><br />
-                                                        <fieldset>

src/router/services/ddns.c

@@ -82 +82 @@
-      flag = 7;
-    }
+  else if (nvram_match ("ddns_enable", "8"))
+    {
+      strcpy (service, "default@tzo.com");
+      flag = 8;
+    }
-
-/* botho 30/07/06 : add www.3322.org */
@@ -132 +137 @@
-      snprintf (_hostname, sizeof (_hostname), "%s", "ddns_hostname_7");
-      snprintf (_wildcard, sizeof (_wildcard), "%s", "ddns_wildcard_7");
+    }
+  else if (flag == 8)
+    {
+      snprintf (_username, sizeof (_username), "%s", "ddns_username_8");
+      snprintf (_passwd, sizeof (_passwd), "%s", "ddns_passwd_8");
+      snprintf (_hostname, sizeof (_hostname), "%s", "ddns_hostname_8");
-    }
-

src/router/services/defaults.c

@@ -998 +998 @@
-  {"ddns_hostname_7", "", 0},
-  {"ddns_wildcard_7", "", 0},
+  // for tzo.com 
+  {"ddns_username_8", "", 0},
+  {"ddns_passwd_8", "", 0},
+  {"ddns_hostname_8", "", 0},
-
-  /* for last value */