Changeset 32000


Ignore:
Timestamp:
May 9, 2017, 5:59:49 PM (7 weeks ago)
Author:
brainslayer
Message:

allow to determine method in functions

Location:
src/router/httpd
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • src/router/httpd/common.c

    r12223 r32000  
    22
    33#ifdef HAVE_OPENSSL
    4 # include <openssl/err.h>
     4#include <openssl/err.h>
    55BIO *bio_err = 0;
    66#endif
  • src/router/httpd/common.h

    r12223 r32000  
    1616
    1717#ifdef HAVE_MATRIXSSL
    18 # include <matrixSsl.h>
     18#include <matrixSsl.h>
    1919#endif
    2020
  • src/router/httpd/ej.c

    r28036 r32000  
    326326}
    327327
    328 void do_ej(struct mime_handler *handler, char *path, webs_t stream, char *query)        // jimmy, https, 8/4/2003
     328void do_ej(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query)  // jimmy, https, 8/4/2003
    329329{
    330330        FILE *fp = NULL;
  • src/router/httpd/httpd.c

    r31998 r32000  
    495495}
    496496
    497 static void do_file_2(struct mime_handler *handler, char *path, webs_t stream, char *query, char *attach)       //jimmy, https, 8/4/2003
     497static void do_file_2(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query, char *attach) //jimmy, https, 8/4/2003
    498498{
    499499
     
    525525void
    526526//do_file(char *path, FILE *stream)
    527 do_file(struct mime_handler *handler, char *path, webs_t stream, char *query)   //jimmy, https, 8/4/2003
    528 {
    529 
    530         do_file_2(handler, path, stream, query, NULL);
     527do_file(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query)     //jimmy, https, 8/4/2003
     528{
     529
     530        do_file_2(method, handler, path, stream, query, NULL);
    531531}
    532532
     
    534534{
    535535
    536         do_file_2(handler, path, stream, query, attachment);
     536        do_file_2(NULL, handler, path, stream, query, attachment);
    537537}
    538538
     
    636636
    637637        /* To prevent http receive https packets, cause http crash (by honor 2003/09/02) */
    638         if (strncasecmp(line, "GET", 3) && strncasecmp(line, "POST", 4)) {
     638        if (strncasecmp(line, "GET", 3) && strncasecmp(line, "POST", 4) && strncasecmp(line, "OPTIONS", 7)) {
    639639                return;
    640640        }
     
    702702        }
    703703
    704         if (strcasecmp(method, "get") != 0 && strcasecmp(method, "post") != 0) {
     704        if (strcasecmp(method, "get") != 0 && strcasecmp(method, "post") != 0 && strcasecmp(method, "options") != 0) {
    705705                send_error(501, "Not Implemented", (char *)0, "That method is not implemented.");
    706706                return;
     
    10951095                                        }
    10961096                                        if (handler->output && file_found) {
    1097                                                 handler->output(handler, file, conn_fp, query);
     1097                                                handler->output(method, handler, file, conn_fp, query);
    10981098                                        } else {
    10991099                                                send_error(404, "Not Found", (char *)0, "File not found.");
  • src/router/httpd/httpd.h

    r31734 r32000  
    2323#ifdef HAVE_MATRIXSSL
    2424#define DDWRT
    25 # include <matrixSsl.h>
    26 # include <matrixssl_xface.h>
     25#include <matrixSsl.h>
     26#include <matrixssl_xface.h>
    2727#endif
    2828
     
    6868        char *extra_header;
    6969        void (*input) (char *path, webs_t stream, int len, char *boundary);
    70         void (*output) (struct mime_handler * handler, char *path, webs_t stream, char *query);
     70        void (*output) (char *method, struct mime_handler * handler, char *path, webs_t stream, char *query);
    7171        int (*auth) (webs_t wp, char *userid, char *passwd, char *realm, char *authorisation, int (*auth_check) (char *userid, char *passwd, char *dirname, char *authorisation));
    7272        unsigned char send_headers;
     
    8989
    9090/* Regular file handler */
    91 extern void do_file(struct mime_handler *handler, char *path, webs_t stream, char *query);
     91extern void do_file(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query);
    9292extern void do_file_attach(struct mime_handler *handler, char *path, webs_t stream, char *query, char *attachment);
    9393
     
    119119        int (*PwebsWrite) (webs_t wp, char *fmt, ...);
    120120        struct wl_client_mac *Pwl_client_macs;
    121         void (*Pdo_ej) (struct mime_handler * handler, char *path, webs_t stream, char *query); // jimmy, https, 8/4/2003
     121        void (*Pdo_ej) (char *method, struct mime_handler * handler, char *path, webs_t stream, char *query);   // jimmy, https, 8/4/2003
    122122        int (*PejArgs) (int argc, char_t ** argv, char_t * fmt, ...);
    123123        FILE *(*PgetWebsFile) (char *path);
     
    134134
    135135#define websSetVar(wp, var, value) set_cgi(var, value)
    136 #define websDefaultHandler(wp, urlPrefix, webDir, arg, url, path, query) ({ do_ej(path, wp,""); fflush(wp); 1; })
     136#define websDefaultHandler(wp, urlPrefix, webDir, arg, url, path, query) ({ do_ej(method, path, wp,""); fflush(wp); 1; })
    137137#define websWriteData(wp, buf, nChars) ({ int TMPVAR = wfwrite(buf, 1, nChars, wp); wfflush(wp); TMPVAR; })
    138138#define websWriteDataNonBlock websWriteData
     
    146146extern FILE *getWebsFile(char *path);
    147147extern int ejArgs(int argc, char_t ** argv, char_t * fmt, ...);
    148 extern void do_ej(struct mime_handler *handler, char *path, webs_t stream, char *query);
     148extern void do_ej(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query);
    149149extern void do_ej_buffer(char *buffer, webs_t stream);
    150150extern int websWrite(webs_t wp, char *fmt, ...);
  • src/router/httpd/modules/base.c

    r31999 r32000  
    436436}
    437437
    438 static void do_bigfile(struct mime_handler *handler, char *path, webs_t stream, char *query)
     438static void do_bigfile(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query)
    439439{
    440440        char fs[32];
     
    450450        long filesize = atol(fs);
    451451        long i;
    452         char *test = malloc(65536);
    453         srand(time(NULL));
    454         for (i = 0; i < 65536; i++)
    455                 test[i] = rand() % 255;
    456452        if (!handler->send_headers) {
    457453                char *extra;
     
    464460                free(extra);
    465461        }
     462        if (!strncasecmp(method, "OPTIONS", 7))
     463                return;
     464
     465        char *test = malloc(65536);
     466        srand(time(NULL));
     467        for (i = 0; i < 65536; i++)
     468                test[i] = rand() % 255;
    466469        for (i = 0; i < filesize / 65536; i++) {
    467470                wfwrite(test, 65536, 1, stream);
     
    472475}
    473476
    474 static void do_filtertable(struct mime_handler *handler, char *path, webs_t stream, char *query)
     477static void do_filtertable(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query)
    475478{
    476479        char ifname[32];
     
    505508#include <radiusdb.h>
    506509
    507 static void cert_file_out(struct mime_handler *handler, char *path, webs_t stream, char *query)
     510static void cert_file_out(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query)
    508511{
    509512        int idx = indexof(path, '/');
     
    525528}
    526529
    527 static void do_radiuscert(struct mime_handler *handler, char *path, webs_t stream, char *query)
     530static void do_radiuscert(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query)
    528531{
    529532        int idx = indexof(path, '-');
     
    677680
    678681#ifdef HAVE_ATH9K
    679 static void do_spectral_scan(struct mime_handler *handler, char *p, webs_t stream, char *query)
     682static void do_spectral_scan(char *method, struct mime_handler *handler, char *p, webs_t stream, char *query)
    680683{
    681684#define json_cache "/tmp/spectral_scan.json"
     
    732735#endif
    733736
    734 static void do_activetable(struct mime_handler *handler, char *path, webs_t stream, char *query)
     737static void do_activetable(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query)
    735738{
    736739        char *temp2 = NULL;
     
    760763}
    761764
    762 static void do_wds(struct mime_handler *handler, char *path, webs_t stream, char *query)
     765static void do_wds(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query)
    763766{
    764767        int idx = indexof(path, '-');
     
    774777}
    775778
    776 static void do_wireless_adv(struct mime_handler *handler, char *path, webs_t stream, char *query)
     779static void do_wireless_adv(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query)
    777780{
    778781        int idx = indexof(path, '-');
     
    11871190        }
    11881191        if (!strncmp(path, "WL_FilterTable", 14))
    1189                 do_filtertable(NULL, path, wp, NULL);   // refresh
     1192                do_filtertable(NULL, NULL, path, wp, NULL);     // refresh
    11901193#ifdef HAVE_FREERADIUS
    11911194        else if (!strncmp(path, "FreeRadiusCert", 14))
    1192                 do_radiuscert(NULL, path, wp, NULL);    // refresh
     1195                do_radiuscert(NULL, NULL, path, wp, NULL);      // refresh
    11931196#endif
    11941197        // #ifdef HAVE_MADWIFI
    11951198        else if (!strncmp(path, "WL_ActiveTable", 14))
    1196                 do_activetable(NULL, path, wp, NULL);   // refresh
     1199                do_activetable(NULL, NULL, path, wp, NULL);     // refresh
    11971200        else if (!strncmp(path, "Wireless_WDS", 12))
    1198                 do_wds(NULL, path, wp, NULL);   // refresh
     1201                do_wds(NULL, NULL, path, wp, NULL);     // refresh
    11991202        // #endif
    12001203        else if (!strncmp(path, "Wireless_Advanced", 17))
    1201                 do_wireless_adv(NULL, path, wp, NULL);  // refresh
     1204                do_wireless_adv(NULL, NULL, path, wp, NULL);    // refresh
    12021205        else
    1203                 do_ej(NULL, path, wp, NULL);    // refresh
     1206                do_ej(NULL, NULL, path, wp, NULL);      // refresh
    12041207        websDone(wp, 200);
    12051208
     
    15031506        /** GUI Logout **/// Experimental, not work yet ...
    15041507        else if (!strncmp(value, "Logout", 6)) {
    1505                 do_ej(NULL, "Logout.asp", wp, NULL);
     1508                do_ej(NULL, NULL, "Logout.asp", wp, NULL);
    15061509                websDone(wp, 200);
    15071510                do_logout();
     
    15421545
    15431546                if (!strncmp(path, "WL_FilterTable", 14))
    1544                         do_filtertable(NULL, path, wp, NULL);   // refresh
     1547                        do_filtertable(NULL, NULL, path, wp, NULL);     // refresh
    15451548#ifdef HAVE_FREERADIUS
    15461549                else if (!strncmp(path, "FreeRadiusCert", 14))
    1547                         do_radiuscert(NULL, path, wp, NULL);    // refresh     
     1550                        do_radiuscert(NULL, NULL, path, wp, NULL);      // refresh     
    15481551#endif
    15491552                else if (!strncmp(path, "WL_ActiveTable", 14))
    1550                         do_activetable(NULL, path, wp, NULL);   // refresh     
     1553                        do_activetable(NULL, NULL, path, wp, NULL);     // refresh     
    15511554                else if (!strncmp(path, "Wireless_WDS", 12))
    1552                         do_wds(NULL, path, wp, NULL);   // refresh
     1555                        do_wds(NULL, NULL, path, wp, NULL);     // refresh
    15531556                else if (!strncmp(path, "Wireless_Advanced", 17))
    1554                         do_wireless_adv(NULL, path, wp, NULL);  // refresh
     1557                        do_wireless_adv(NULL, NULL, path, wp, NULL);    // refresh
    15551558                else
    1556                         do_ej(NULL, path, wp, NULL);    // refresh
     1559                        do_ej(NULL, NULL, path, wp, NULL);      // refresh
    15571560                websDone(wp, 200);
    15581561        } else {
    15591562#ifndef HAVE_WRK54G
    1560                 do_ej(NULL, "Reboot.asp", wp, NULL);
     1563                do_ej(NULL, NULL, "Reboot.asp", wp, NULL);
    15611564                websDone(wp, 200);
    15621565#endif
     
    16721675
    16731676#if !defined(HAVE_X86) && !defined(HAVE_MAGICBOX)
    1674 static void do_cfebackup(struct mime_handler *handler, char *url, webs_t stream, char *query)
     1677static void do_cfebackup(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)
    16751678{
    16761679        system2("cat /dev/mtd/0 > /tmp/cfe.bin");
     
    16811684
    16821685#ifdef HAVE_PRIVOXY
    1683 static void do_wpad(struct mime_handler *handler, char *url, webs_t stream, char *query)
     1686static void do_wpad(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)
    16841687{
    16851688        FILE *fp;
     
    17031706
    17041707#ifdef HAVE_ROUTERSTYLE
    1705 static void do_stylecss(struct mime_handler *handler, char *url, webs_t stream, char *query)
     1708static void do_stylecss(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)
    17061709{
    17071710        char *style = nvram_get("router_style");
     
    18171820}
    18181821
    1819 static void do_stylecss_ie(struct mime_handler *handler, char *url, webs_t stream, char *query)
     1822static void do_stylecss_ie(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)
    18201823{
    18211824        websWrite(stream, ".submitFooter input {\npadding:.362em .453em;\n}\n"  //
     
    18251828#endif
    18261829#ifdef HAVE_REGISTER
    1827 static void do_trial_logo(struct mime_handler *handler, char *url, webs_t stream, char *query)
     1830static void do_trial_logo(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)
    18281831{
    18291832#if defined(HAVE_TRIMAX) || defined(HAVE_MAKSAT) || defined(HAVE_VILIM) || defined(HAVE_TELCOM) || defined(HAVE_WIKINGS) || defined(HAVE_NEXTMEDIA)
    1830         do_file(handler, url, stream, query);
     1833        do_file(method, handler, url, stream, query);
    18311834#else
    18321835        if (!isregistered_real()) {
    1833                 do_file(handler, "style/logo-trial.png", stream, query);
     1836                do_file(method, handler, "style/logo-trial.png", stream, query);
    18341837        } else {
    18351838                if (iscpe()) {
    1836                         do_file(handler, "style/logo-cpe.png", stream, query);
     1839                        do_file(method, handler, "style/logo-cpe.png", stream, query);
    18371840                } else {
    1838                         do_file(handler, url, stream, query);
     1841                        do_file(method, handler, url, stream, query);
    18391842                }
    18401843        }
     
    18491852 */
    18501853
    1851 static void do_mypage(struct mime_handler *handler, char *url, webs_t stream, char *query)
     1854static void do_mypage(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)
    18521855{
    18531856        char *snamelist = nvram_safe_get("mypage_scripts");
     
    18761879}
    18771880
    1878 static void do_fetchif(struct mime_handler *handler, char *url, webs_t stream, char *query)
     1881static void do_fetchif(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)
    18791882{
    18801883        char line[256];
     
    21472150
    21482151#ifdef HAVE_STATUS_SYSLOG
    2149 static void do_syslog(struct mime_handler *handler, char *url, webs_t stream, char *query)
     2152static void do_syslog(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)
    21502153{
    21512154
     
    21982201}
    21992202#endif
    2200 static void do_ttgraph(struct mime_handler *handler, char *url, webs_t stream, char *query)
     2203static void do_ttgraph(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)
    22012204{
    22022205#define COL_WIDTH 16            /* single column width */
     
    23322335}
    23332336
    2334 static void ttraff_backup(struct mime_handler *handler, char *url, webs_t stream, char *query)
     2337static void ttraff_backup(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)
    23352338{
    23362339        system2("echo TRAFF-DATA > /tmp/traffdata.bak");
     
    23402343}
    23412344
    2342 static void do_apply_cgi(struct mime_handler *handler, char *url, webs_t stream, char *q)
     2345static void do_apply_cgi(char *method, struct mime_handler *handler, char *url, webs_t stream, char *q)
    23432346{
    23442347        char *path, *query;
     
    23652368
    23662369#ifdef HAVE_LANGUAGE
    2367 static void do_language(struct mime_handler *handler, char *path, webs_t stream, char *query)   // jimmy,
     2370static void do_language(char *method, struct mime_handler *handler, char *path, webs_t stream, char *query)     // jimmy,
    23682371            // https,
    23692372            // 8/4/2003
     
    23762379
    23772380        asprintf(&lang, "%s%s", prefix, langname);
    2378         do_file(handler, lang, stream, NULL);
     2381        do_file(method, handler, lang, stream, NULL);
    23792382
    23802383        free(lang);
  • src/router/httpd/modules/nvramsr.c

    r27436 r32000  
    8787}
    8888
    89 void sr_config_cgi(struct mime_handler *handler, char *path, webs_t wp, char *query)
     89void sr_config_cgi(char *method, struct mime_handler *handler, char *path, webs_t wp, char *query)
    9090{
    9191        if (restore_ret != 0)
    92                 do_ej(handler, "Fail.asp", wp, NULL);
     92                do_ej(NULL, handler, "Fail.asp", wp, NULL);
    9393        else
    94                 do_ej(handler, "Success_rest.asp", wp, NULL);
     94                do_ej(NULL, handler, "Success_rest.asp", wp, NULL);
    9595
    9696        websDone(wp, 200);
     
    106106}
    107107
    108 void nv_file_out(struct mime_handler *handler, char *path, webs_t wp, char *query)
     108void nv_file_out(char *method, struct mime_handler *handler, char *path, webs_t wp, char *query)
    109109{
    110110
     
    183183}
    184184
    185 void td_config_cgi(struct mime_handler *handler, char *path, webs_t wp, char *query)
     185void td_config_cgi(char *method, struct mime_handler *handler, char *path, webs_t wp, char *query)
    186186{
    187         do_ej(handler, "Traff_admin.asp", wp, NULL);
     187        do_ej(NULL, handler, "Traff_admin.asp", wp, NULL);
    188188        websDone(wp, 200);
    189189}
  • src/router/httpd/modules/upgrade.c

    r31785 r32000  
    3232
    3333#if (__BYTE_ORDER == __LITTLE_ENDIAN)
    34 #  define HOST_TO_BE32(x)       bswap_32(x)
    35 #  define HOST_TO_BE16(x)       bswap_16(x)
    36 #else
    37 #  define HOST_TO_BE32(x)       (x)
    38 #  define HOST_TO_BE16(x)       (x)
     34#define HOST_TO_BE32(x) bswap_32(x)
     35#define HOST_TO_BE16(x) bswap_16(x)
     36#else
     37#define HOST_TO_BE32(x) (x)
     38#define HOST_TO_BE16(x) (x)
    3939#endif
    4040
     
    5858void
    5959// do_upgrade_cgi(char *url, FILE *stream)
    60 do_upgrade_cgi(struct mime_handler *handler, char *url, webs_t stream, char *query)     // jimmy, https,
     60do_upgrade_cgi(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)       // jimmy, https,
    6161                                                        // 8/6/2003
    6262{
     
    6565        fprintf(stderr, "[UPGRADE] ret: %d\n", upgrade_ret);
    6666        if (upgrade_ret) {
    67                 do_ej(handler, "Fail_u_s.asp", stream, NULL);
     67                do_ej(NULL, handler, "Fail_u_s.asp", stream, NULL);
    6868                killall("ledtool", SIGTERM);
    6969                led_control(LED_DIAG, LED_OFF);
    7070        } else {
    71                 do_ej(handler, "Success_u_s.asp", stream, NULL);
     71                do_ej(NULL, handler, "Success_u_s.asp", stream, NULL);
    7272        }
    7373        websDone(stream, 200);
     
    8282#else
    8383
    84         do_ej(handler, "Fail_u_s.asp", stream, NULL);
     84        do_ej(NULL, handler, "Fail_u_s.asp", stream, NULL);
    8585        websDone(stream, 200);
    8686
  • src/router/httpd/modules/upgrade_rb500.c

    r30528 r32000  
    3333void
    3434// do_upgrade_cgi(char *url, FILE *stream)
    35 do_upgrade_cgi(struct mime_handler *handler, char *url, webs_t streamm, char *query)    // jimmy,
     35do_upgrade_cgi(char *method, struct mime_handler *handler, char *url, webs_t streamm, char *query)      // jimmy,
    3636                                                                // https,
    3737                                                                // 8/6/2003
     
    4040        fprintf(stderr, "do post\n");
    4141        if (upgrade_ret)
    42                 do_ej(handler, "Fail_u_s.asp", stream, NULL);
     42                do_ej(NULL, handler, "Fail_u_s.asp", stream, NULL);
    4343        else
    44                 do_ej(handler, "Success_u_s.asp", stream, NULL);
     44                do_ej(NULL, handler, "Success_u_s.asp", stream, NULL);
    4545        fprintf(stderr, "websdone\n");
    4646
     
    5656        }
    5757#else
    58         do_ej(handler, "Fail_u_s.asp", stream, NULL);
     58        do_ej(NULL, handler, "Fail_u_s.asp", stream, NULL);
    5959        websDone(stream, 200);
    6060#endif
  • src/router/httpd/modules/upgrade_x86.c

    r31718 r32000  
    3737void
    3838// do_upgrade_cgi(char *url, FILE *stream)
    39 do_upgrade_cgi(struct mime_handler *handler, char *url, webs_t stream, char *query)     // jimmy, https,
     39do_upgrade_cgi(char *method, struct mime_handler *handler, char *url, webs_t stream, char *query)       // jimmy, https,
    4040                                                        // 8/6/2003
    4141{
     
    4343        fprintf(stderr, "do post\n");
    4444        if (upgrade_ret)
    45                 do_ej(handler, "Fail_u_s.asp", stream, NULL);
     45                do_ej(NULL, handler, "Fail_u_s.asp", stream, NULL);
    4646        else
    47                 do_ej(handler, "Success_u_s.asp", stream, NULL);
     47                do_ej(NULL, handler, "Success_u_s.asp", stream, NULL);
    4848        fprintf(stderr, "websdone\n");
    4949
     
    6060        }
    6161#else
    62         do_ej(handler, "Fail_u_s.asp", stream, NULL);
     62        do_ej(NULL, handler, "Fail_u_s.asp", stream, NULL);
    6363        websDone(stream, 200);
    6464#endif
  • src/router/httpd/visuals/dd-wrt.c

    r31927 r32000  
    55515551                killall("rstats", sig);
    55525552                wait_file_exists(name, 5, 0);
    5553                 do_file(name, wp, NULL);
     5553                do_file(NULL, name, wp, NULL);
    55545554                unlink(name);
    55555555        }
  • src/router/httpd/visuals/ejs.c

    r31471 r32000  
    6060int (*websWrite) (webs_t wp, char *fmt, ...) = NULL;
    6161struct wl_client_mac *wl_client_macs = NULL;
    62 void (*do_ej) (struct mime_handler * handler, char *path, webs_t stream, char *query) = NULL;   // jimmy,
     62void (*do_ej) (char *method, struct mime_handler * handler, char *path, webs_t stream, char *query) = NULL;     // jimmy,
    6363                                                                        // https,
    6464                                                                        // 8/4/2003
     
    11261126                for (i = 0; i < resultcount; i++) {
    11271127                        sprintf(buf, "%s/%s", directories[idx], result[i]);
    1128                         do_ej(NULL, buf, wp, NULL);
     1128                        do_ej(NULL, NULL, buf, wp, NULL);
    11291129                }
    11301130                for (i = 0; i < resultcount; i++) {
  • src/router/httpd/visuals/index.c

    r30528 r32000  
    3838                type = nvram_safe_get("wan_proto");
    3939#ifdef HAVE_DSL_CPE_CONTROL
    40         do_ej(NULL, "index_atm.asp", wp, NULL);
     40        do_ej(NULL, NULL, "index_atm.asp", wp, NULL);
    4141#endif
    4242        char ejname[32];
    4343        snprintf(ejname, 31, "index_%s.asp", type);
    44         do_ej(NULL, ejname, wp, NULL);
     44        do_ej(NULL, NULL, ejname, wp, NULL);
    4545}
    4646
  • src/router/httpd/visuals/setupassistant.c

    r31254 r32000  
    193193void ej_show_sas_stage(webs_t wp, int argc, char_t ** argv)
    194194{
    195         do_ej(NULL, "sas_stage_1.asp", wp, NULL);
     195        do_ej(NULL, NULL, "sas_stage_1.asp", wp, NULL);
    196196}
    197197
     
    205205        char ejname[32];
    206206        snprintf(ejname, 31, "sas_%s.asp", type);
    207         do_ej(NULL, ejname, wp, NULL);
     207        do_ej(NULL, NULL, ejname, wp, NULL);
    208208}
    209209
  • src/router/httpd/visuals/status.c

    r31411 r32000  
    5050{
    5151
    52         do_ej(NULL, "Status_Router1.asp", wp, NULL);
     52        do_ej(NULL, NULL, "Status_Router1.asp", wp, NULL);
    5353
    5454        return;
Note: See TracChangeset for help on using the changeset viewer.