Changeset 17815

Timestamp:

10/28/11 09:50:18 (19 months ago)

Author:

eko

Message:

inadyn-mt: don't use language stuff

Location:

src/router/inadyn-mt

Files:

• Makefile (modified) (1 diff)
• src/dyndns.c (modified) (4 diffs)
• src/inadyn_cmd.c (modified) (1 diff)
• src/os.c (modified) (1 diff)
• src/os_unix.c (modified) (2 diffs)

src/router/inadyn-mt/Makefile

@@ -110 +110 @@
         $(OUTDIR)/os_unix.o $(OUTDIR)/os_windows.o $(OUTDIR)/tcp.o \
         $(OUTDIR)/inadyn_cmd.o $(OUTDIR)/unicode_util.o $(OUTDIR)/numbers.o \
-        $(OUTDIR)/dblhash.o $(OUTDIR)/lang.o $(OUTDIR)/path.o $(OUTDIR)/safe_mem.o \
+        $(OUTDIR)/dblhash.o
+#       $(OUTDIR)/lang.o 
+        $(OUTDIR)/path.o $(OUTDIR)/safe_mem.o \
         $(OUTDIR)/md5.o $(ARCH_SPECIFIC_OBJS)
 

src/router/inadyn-mt/src/dyndns.c

@@ -117 +117 @@
 #include "ip.h"
 
+extern int nvram_match(char *name, char *match);
+extern char *nvram_safe_get(const char *name);
+
 typedef struct CB_ALERT_DATA {
 
@@ -2157 +2160 @@
         {
 
+                if (nvram_match("ddns_wan_ip","1"))
+                {
+                char new_ip_str[32];
+                int wan_link = check_wan_link(0);
+                char *wan_ipaddr = NULL;
+                if (nvram_match("wan_proto", "pptp")) {
+                        wan_ipaddr =
+                            wan_link ? nvram_safe_get("pptp_get_ip") :
+                            nvram_safe_get("wan_ipaddr");
+                } else if (!strcmp(nvram_safe_get("wan_proto"), "pppoe")) {
+                        wan_ipaddr =
+                            wan_link ? nvram_safe_get("wan_ipaddr") : "0.0.0.0";
+                } else if (!strcmp(nvram_safe_get("wan_proto"), "3g")) {
+                        wan_ipaddr =
+                            wan_link ? nvram_safe_get("wan_ipaddr") : "0.0.0.0";
+                } else if (nvram_match("wan_proto", "l2tp")) {
+                        wan_ipaddr =
+                            wan_link ? nvram_safe_get("l2tp_get_ip") :
+                            nvram_safe_get("wan_ipaddr");
+                } else if (nvram_match("wan_proto", "disabled")) {
+                        wan_ipaddr = "0.0.0.0";
+                } else {
+                        wan_ipaddr = nvram_safe_get("wan_ipaddr");
+                }
+                if (!strcmp(wan_ipaddr,"0.0.0.0")) {
+                        DBG_PRINTF((LOG_WARNING,"W:DYNDNS: Error: device has no WAN Address...\n"));
+                        rc = RC_ERROR; 
+                        is_exit=true;
+                        break;
+                    }
+                strcpy(new_ip_str,wan_ipaddr);
+                p_self->info.my_ip_has_changed[ip_store] = (strcmp(new_ip_str, p_self->info.my_ip_address.name[ip_store]) != 0);
+                strcpy(p_self->info.my_ip_address.name[ip_store], new_ip_str);
+                rc = RC_OK;
+                }else{
+
                 DBG_PRINTF((LOG_INFO,"I:DYNDNS: dyn_dns_update_ip entering connect loop...\n"));
 
@@ -2195 +2234 @@
                         sleep_lightly_ms(p_self->retry_interval,&is_exit_requested_void,p_self);
                 }
-
+                }
                 if (is_exit) {
 
@@ -3346 +3385 @@
 
                 /*use hard coded defaults -- don't use default locale file*/
-                dealloc_lang_strings();
+//              dealloc_lang_strings();
 
                 DBG_PRINTF((LOG_INFO, "I:" MODULE_TAG "Empty --lang_file parameter.  Deallocated language strings, using hard coded english defaults...\n"));
         }
-        else {
-
-                /*if opt around default language strings, use that*/
-                if (p_dyndns->lang_file) {
-
-                        if (!(re_init_lang_strings(p_dyndns->lang_file)==RC_OK)) {
-
-                                DBG_PRINTF((LOG_WARNING, "W:" MODULE_TAG "Failed using default override language strings file, %s...\n",p_dyndns->lang_file));
-                        }
-                }
-        }
+//      else {
+//
+//              /*if opt around default language strings, use that*/
+//              if (p_dyndns->lang_file) {
+//
+//                      if (!(re_init_lang_strings(p_dyndns->lang_file)==RC_OK)) {
+//
+//                              DBG_PRINTF((LOG_WARNING, "W:" MODULE_TAG "Failed using default override language strings file, %s...\n",p_dyndns->lang_file));
+//                      }
+//              }
+//      }
 
         /*if logfile provided, redirect output to log file*/

src/router/inadyn-mt/src/inadyn_cmd.c

@@ -1165 +1165 @@
 
         p_self->lang_hard_coded=1;
-
-
-        if (current_nr>=p_cmd->argc) /*no parameter -- means use hard coded*/
-
-                return RC_OK;
-
-        if (!(strncmp(p_cmd->argv[current_nr],"-",1))) /*no parameter -- means use hard coded*/
-
-                return RC_OK;
-
-
-        p_self->lang_hard_coded=0;
-
-
-        if ((is_file(p_cmd->argv[current_nr]))) { /*ignore if invalid*/
-
-                DBG_PRINTF((LOG_INFO,"I:" MODULE_TAG "Using default override language strings file, %s...\n",p_cmd->argv[current_nr]));
-        }
-        else {
-
-                DBG_PRINTF((LOG_WARNING,"W:" MODULE_TAG "Could not open default override language strings file, %s...\n",p_cmd->argv[current_nr]));
-
-                return RC_OK;
-        }
-
-        if (p_self->lang_file)
-
-                free(p_self->lang_file);
-
-#ifdef _WIN32
-
-        nt_console_name2(&(p_self->lang_file),p_cmd->argv[current_nr]);
-
-#else
-
-        p_self->lang_file=safe_malloc(strlen(p_cmd->argv[current_nr])+1);
-
-        strcpy(p_self->lang_file,p_cmd->argv[current_nr]);
-
-#endif
-
+        
+//dd-wrt - always use hardcoded language
+//      if (current_nr>=p_cmd->argc) /*no parameter -- means use hard coded*/
+//
+//              return RC_OK;
+//
+//      if (!(strncmp(p_cmd->argv[current_nr],"-",1))) /*no parameter -- means use hard coded*/
+//
+//              return RC_OK;
+//
+//
+//      p_self->lang_hard_coded=0;
+//
+//
+//      if ((is_file(p_cmd->argv[current_nr]))) { /*ignore if invalid*/
+//
+//              DBG_PRINTF((LOG_INFO,"I:" MODULE_TAG "Using default override language strings file, %s...\n",p_cmd->argv[current_nr]));
+//      }
+//      else {
+//
+//              DBG_PRINTF((LOG_WARNING,"W:" MODULE_TAG "Could not open default override language strings file, %s...\n",p_cmd->argv[current_nr]));
+//
+//              return RC_OK;
+//      }
+//
+//      if (p_self->lang_file)
+//
+//              free(p_self->lang_file);
+//
+//#ifdef _WIN32
+//
+//      nt_console_name2(&(p_self->lang_file),p_cmd->argv[current_nr]);
+//
+//#else
+//
+//      p_self->lang_file=safe_malloc(strlen(p_cmd->argv[current_nr])+1);
+//
+//      strcpy(p_self->lang_file,p_cmd->argv[current_nr]);
+//
+//#endif
 
         return RC_OK;

src/router/inadyn-mt/src/os.c

@@ -274 +274 @@
 
 
-        vsnprintf(message, buff_size-1, langStr(szLangStr,tmp_buff,MAXSTRING), args);
+//      vsnprintf(message, buff_size-1, langStr(szLangStr,tmp_buff,MAXSTRING), args);
+        vsnprintf(message, buff_size-1, tmp_buff, args);
 
         return message;

src/router/inadyn-mt/src/os_unix.c

@@ -222 +222 @@
 
 
-        init_lang_strings(NULL,setlocale(LC_ALL, ""));
+//      init_lang_strings(NULL,setlocale(LC_ALL, ""));
 
 
@@ -228 +228 @@
 
 
-        dealloc_lang_strings();
+//      dealloc_lang_strings();