forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

listening-host support on all modes

This commit is contained in:
Adam D. Ruppe 2014-12-12 09:38:48 -05:00
parent d9e6fbeedc
commit 3084267a11
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cgi.d
View File

@ -2482,6 +2482,11 @@ mixin template CustomCgiMain(CustomCgi, alias fun, long maxContentLength = defau
sockaddr_in addr; sockaddr_in addr;
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(listeningPort(8085)); addr.sin_port = htons(listeningPort(8085));
auto lh = listeningHost();
if(lh.length) {
if(inet_pton(AF_INET, lh.toStringz(), &addr.sin_addr.s_addr) != 1)
throw new Exception("bad listening host given, please use an IP address.\nExample: --listening-host 127.0.0.1 means listen only on Localhost.\nExample: --listening-host 0.0.0.0 means listen on all interfaces.\nOr you can pass any other single numeric IPv4 address.");
} else
addr.sin_addr.s_addr = INADDR_ANY; addr.sin_addr.s_addr = INADDR_ANY;
// HACKISH // HACKISH
@ -2582,13 +2587,13 @@ mixin template CustomCgiMain(CustomCgi, alias fun, long maxContentLength = defau
} }
} else } else
version(embedded_httpd_threads) { version(embedded_httpd_threads) {
auto manager = new ListeningConnectionManager(listeningPort(8085), &doThreadHttpConnection!(CustomCgi, fun)); auto manager = new ListeningConnectionManager(listeningHost(), listeningPort(8085), &doThreadHttpConnection!(CustomCgi, fun));
manager.listen(); manager.listen();
} else } else
version(scgi) { version(scgi) {
import std.exception; import std.exception;
import al = std.algorithm; import al = std.algorithm;
auto manager = new ListeningConnectionManager(listeningPort(4000), &doThreadScgiConnection!(CustomCgi, fun, maxContentLength)); auto manager = new ListeningConnectionManager(listeningHost(), listeningPort(4000), &doThreadScgiConnection!(CustomCgi, fun, maxContentLength));
manager.listen(); manager.listen();
} else } else
version(fastcgi) { version(fastcgi) {
@ -3129,7 +3134,7 @@ class ConnectionThread2 : Thread {
To use this thing: To use this thing:
void handler(Socket s) { do something... } void handler(Socket s) { do something... }
auto manager = new ListeningConnectionManager(80, &handler); auto manager = new ListeningConnectionManager("127.0.0.1", 80, &handler);
manager.listen(); manager.listen();
I suggest you use BufferedInputRange(connection) to handle the input. As a packet I suggest you use BufferedInputRange(connection) to handle the input. As a packet
@ -3174,11 +3179,11 @@ class ListeningConnectionManager {
} }
} }
this(ushort port, void function(Socket) handler) { this(string host, ushort port, void function(Socket) handler) {
this.handler = handler; this.handler = handler;
listener = new TcpSocket(); listener = new TcpSocket();
listener.setOption(SocketOptionLevel.SOCKET, SocketOption.REUSEADDR, true); listener.setOption(SocketOptionLevel.SOCKET, SocketOption.REUSEADDR, true);
listener.bind(new InternetAddress(port)); listener.bind(host.length ? parseAddress(host, port) : new InternetAddress(port));
listener.listen(128); listener.listen(128);
} }