Changeset 74

Timestamp:

07/01/09 16:22:13 (4 years ago)

Author:

cyrus

Message:

Export REMOTE_ADDR and SERVER_ADDR through LuCIttpd

Location:

trunk/luci/libs/lucittpd

Files:

• hostfiles/usr/lib/lucittpd/plugins/httpd.lua (modified) (1 diff)
• luasrc/ttpd/server.lua (modified) (1 diff)
• root/usr/lib/lucittpd/plugins/httpd.lua (modified) (1 diff)
• src/main.c (modified) (4 diffs)

trunk/luci/libs/lucittpd/hostfiles/usr/lib/lucittpd/plugins/httpd.lua

@@ -30 +30 @@
                         local chunk, err = webuci_sendfile(...)
                         return chunk or (err and error(err, 0))
-                end
+                end,
+
+                _REMOTE_ADDR = webuci_REMOTE_ADDR,
+                _SERVER_ADDR = webuci_SERVER_ADDR
         })
 end

trunk/luci/libs/lucittpd/luasrc/ttpd/server.lua

@@ -323 +323 @@
                 end
 
+                -- set remote_addr and server_addr
+                message.env.REMOTE_ADDR = self._REMOTE_ADDR
+                message.env.SERVER_ADDR = self._SERVER_ADDR
+
                 -- keep-alive
                 if message.http_version == 1.1 then

trunk/luci/libs/lucittpd/root/usr/lib/lucittpd/plugins/httpd.lua

@@ -31 +31 @@
                         local chunk, err = webuci_sendfile(...)
                         return chunk or (err and error(err, 0))
-                end
+                end,
+
+                _REMOTE_ADDR = webuci_REMOTE_ADDR,
+                _SERVER_ADDR = webuci_SERVER_ADDR
         })
 end

trunk/luci/libs/lucittpd/src/main.c

@@ -212 +212 @@
 }
 
-static void run_luci(int sockfd)
-{
+static void run_luci(int sockfd, char *remote_addr, char *server_addr)
+{
+        lua_pushstring(ctx.L, remote_addr);
+        lua_setfield(ctx.L, LUA_GLOBALSINDEX, "webuci_REMOTE_ADDR");
+
+        lua_pushstring(ctx.L, server_addr);
+        lua_setfield(ctx.L, LUA_GLOBALSINDEX, "webuci_SERVER_ADDR");
+
         lua_pushinteger(ctx.L, sockfd);
         lua_pushcclosure(ctx.L, webuci_read, 1);
@@ -245 +251 @@
 {
         int sockfd, new_fd;
-        struct sockaddr_storage their_addr;
         socklen_t sin_size;
         int yes = 1;
-        struct sockaddr_in myaddr;
+        struct sockaddr_in myaddr, local_addr, their_addr;
+        char local_ip[INET6_ADDRSTRLEN+1], remote_ip[INET6_ADDRSTRLEN+1];
 
         log_start(1);
@@ -308 +314 @@
                         continue;
                 }
+                memset(remote_ip, 0, sizeof remote_ip);
+                inet_ntop(their_addr.sin_family, (void*)&their_addr.sin_addr,
+                                remote_ip, sizeof remote_ip);
+
+                /* local address */
+                memset(local_ip, 0, sizeof local_ip);
+                sin_size = sizeof local_addr;
+                getsockname(new_fd, (struct sockaddr*)&local_addr, &sin_size);
+                inet_ntop(local_addr.sin_family, (void*)&local_addr.sin_addr,
+                                local_ip, sizeof local_ip);
+
 
                 /*inet_ntop(their_addr.ss_family,
@@ -321 +338 @@
                         setsockopt(new_fd, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout));
 
-                        run_luci(new_fd);
+                        run_luci(new_fd, remote_ip, local_ip);
                         cleanup_luci();
                         close(new_fd);