Changeset 14545

Timestamp:

06/05/10 14:22:03 (3 years ago)

Author:

BrainSlayer

Message:

another fragmentation fix

Location:

src/router/httpd

Files:

• Makefile (modified) (1 diff)
• ej.c (modified) (2 diffs)
• httpd.c (modified) (9 diffs)
• modules/callvalidate.c (modified) (7 diffs)

src/router/httpd/Makefile

@@ -18 +18 @@
 endif
 
-BCFLAGS = $(COPTS)  -fPIC 
-#-DMEMDEBUG
+BCFLAGS = $(COPTS)  -fPIC -DMEMDEBUG
 ifeq ($(CONFIG_MSSID),y)
 ifeq ($(CONFIG_BUFFALO),y)

src/router/httpd/ej.c

@@ -321 +321 @@
         int len;
         int i;
+        memdebug_enter();
 
         i = 0;
@@ -345 +346 @@
         }
         fclose(fp);
+        memdebug_leave_info(path);
 
 }

src/router/httpd/httpd.c

@@ -251 +251 @@
         char *enc1;
         char *enc2;
-
+memdebug_enter();
         enc1 = crypt(authinfo, (unsigned char *)user);
 
@@ -262 +262 @@
                 return 0;
         }
+memdebug_leave();
 
         if (strcmp(enc1, user) == 0 && strcmp(enc2, pass) == 0) {
@@ -925 +926 @@
                                 if (registered)
 #endif
+{
+memdebug_enter();
                                         if (!changepassword && handler->auth) {
                                                 int result =
@@ -941 +944 @@
                                                 }
                                         }
+memdebug_leave_info("auth");
+}
                                 post = 0;
                                 if (strcasecmp(method, "post") == 0) {
                                         post = 1;
                                 }
+{
+memdebug_enter();
                                 if (handler->input)
                                         handler->input(file, conn_fp, cl,
                                                        boundary);
+memdebug_leave_info("input");
+}
 #if defined(linux)
 #ifdef HAVE_HTTPS
@@ -975 +984 @@
 #endif
 #endif
+{
+memdebug_enter();
                                 if (check_connect_type() < 0) {
                                         send_error(401, "Bad Request",
@@ -981 +992 @@
                                         return;
                                 }
-
+memdebug_leave_info("connect");
+}
+{
+memdebug_enter();
                                 if (auth_fail == 1) {
                                         send_authenticate(auth_realm);
@@ -993 +1007 @@
                                                              0, NULL);
                                 }
+memdebug_leave_info("auth_output");
+}
+
+{
+memdebug_enter();
                                 if (handler->output) {
                                         handler->output(handler, file, conn_fp,
@@ -998 +1017 @@
                                 }
                                 break;
+memdebug_leave_info("output");
+}
                         }
 
@@ -1404 +1425 @@
                 }
                 get_client_ip_mac(conn_fd);
+memdebug_enter();
                 handle_request();
+memdebug_leave_info("handle_request");
                 wfflush(conn_fp);       // jimmy, https, 8/4/2003
 #ifdef HAVE_HTTPS

src/router/httpd/modules/callvalidate.c

@@ -152 +152 @@
 {
         struct Webenvironment *env;
-        env = (struct Webenvironment *)malloc(sizeof(struct Webenvironment));
         void (*init) (struct Webenvironment * env);
 
@@ -160 +159 @@
                 return -1;
         }
+        env = (struct Webenvironment *)malloc(sizeof(struct Webenvironment));
         env->PwebsGetVar = websGetVar;
         env->PwebsWrite = websWrite;
@@ -291 +291 @@
         int nohandle = 0;
 
+{
+        memdebug_enter();
         if (!handle) {
                 cprintf("load visual_service\n");
@@ -296 +298 @@
                 nohandle = 1;
         }
+        memdebug_leave_info("loadviz");
+}
         if (handle == NULL) {
                 cprintf("handle null\n");
@@ -304 +308 @@
 
         sprintf(service, "ej_%s", name);
+{
+        memdebug_enter();
         if (nohandle) {
                 cprintf("init web\n");
@@ -310 +316 @@
                 }
         }
+        memdebug_leave_info("initweb");
+}
         cprintf("resolving %s\n", service);
         fptr = (void (*)(webs_t wp, int argc, char_t ** argv))dlsym(handle,
                                                                     service);
         cprintf("found. pointer is %p\n", fptr);
+{
         memdebug_enter();
         if (fptr)
@@ -320 +329 @@
                 fprintf(stderr, "function %s not found \n", service);
         memdebug_leave_info(service);
+}
         cprintf("start_sevice_nofree done()\n");
         return handle;