Changeset 10957

Timestamp:

11/19/08 19:45:58 (4 years ago)

Author:

eko

Message:

alowed remote admin ip (seems something wrong with validator, doesn't saves IP ?? ) Will fix tomorrow.

Location:

src/router/httpd

Files:

• modules/broadcom.c (modified) (1 diff)
• validate/validators.c (modified) (1 diff)

src/router/httpd/modules/broadcom.c

@@ -328 +328 @@
                     {
                         tmp->validatename = "validate_wan_ipaddr";
+                    }
+                    if( !stricmp( tmpstr, "MERGEREMOTEIP" ) )
+                    {
+                        tmp->validatename = "validate_remote_ip";
+                        tmp->argv =
+                            ( char ** )malloc( sizeof( char ** ) * 2 );
+                        tmp->argv[0] = getFileString( in );
+                        tmp->argv[1] = NULL;
                     }
                     if( !stricmp( tmpstr, "MERGEIPADDRS" ) )

src/router/httpd/validate/validators.c

@@ -878 +878 @@
 }
 
+void
+validate_remote_ip(webs_t wp, char *value, struct variable *v)
+{
+        char from[20], *to;
+        char remote_ip[254];
+
+                get_merge_ipaddr(wp, v->name, from);            
+                to = websGetVar(wp, "remote_ip_4", NULL);
+                
+                if( !valid_ipaddr( wp, from, v ) )
+                return;
+
+                snprintf(remote_ip, sizeof(remote_ip), "%s %s", from, to);
+                nvram_set("remote_ip", remote_ip);
+
+}
+
+
 #define SRL_VALID(v)        (((v) > 0) && ((v) <= 15))
 #define SFBL_VALID(v)       (((v) > 0) && ((v) <= 15))