KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uhttpd: substitute "+" with space when using the -d flag, lazyload tls support

Browse source 
SVN-Revision: 25220
This commit is contained in:
Jo-Philipp Wich 2011-01-28 19:50:33 +00:00
parent 6c7916e975
commit 3b3e5b7a49
2 changed files with 61 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/uhttpd/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd PKG_NAME:=uhttpd
PKG_RELEASE:=21 PKG_RELEASE:=22
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS := libcyassl liblua PKG_BUILD_DEPENDS := libcyassl liblua

100
package/uhttpd/src/uhttpd.c
View file

@ -620,6 +620,56 @@ static void uh_mainloop(struct config *conf, fd_set serv_fds, int max_fd)
#endif #endif
} }
#ifdef HAVE_TLS
static inline uh_inittls(struct config *conf)
{
/* library handle */
void *lib;
/* already loaded */
if( conf->tls != NULL )
return 0;
/* load TLS plugin */
if( ! (lib = dlopen("uhttpd_tls.so", RTLD_LAZY | RTLD_GLOBAL)) )
{
fprintf(stderr,
"Notice: Unable to load TLS plugin - disabling SSL support! "
"(Reason: %s)\n", dlerror()
);
return 1;
}
else
{
/* resolve functions */
if( !(conf->tls_init = dlsym(lib, "uh_tls_ctx_init")) ||
!(conf->tls_cert = dlsym(lib, "uh_tls_ctx_cert")) ||
!(conf->tls_key = dlsym(lib, "uh_tls_ctx_key")) ||
!(conf->tls_free = dlsym(lib, "uh_tls_ctx_free")) ||
!(conf->tls_accept = dlsym(lib, "uh_tls_client_accept")) ||
!(conf->tls_close = dlsym(lib, "uh_tls_client_close")) ||
!(conf->tls_recv = dlsym(lib, "uh_tls_client_recv")) ||
!(conf->tls_send = dlsym(lib, "uh_tls_client_send"))
) {
fprintf(stderr,
"Error: Failed to lookup required symbols "
"in TLS plugin: %s\n", dlerror()
);
exit(1);
}
/* init SSL context */
if( ! (conf->tls = conf->tls_init()) )
{
fprintf(stderr, "Error: Failed to initalize SSL context\n");
exit(1);
}
}
return 0;
}
#endif
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
@ -650,7 +700,7 @@ int main (int argc, char **argv)
char bind[128]; char bind[128];
char *port = NULL; char *port = NULL;
#if defined(HAVE_TLS) || defined(HAVE_LUA) #ifdef HAVE_LUA
/* library handle */ /* library handle */
void *lib; void *lib;
#endif #endif
@ -686,42 +736,6 @@ int main (int argc, char **argv)
memset(&conf, 0, sizeof(conf)); memset(&conf, 0, sizeof(conf));
memset(bind, 0, sizeof(bind)); memset(bind, 0, sizeof(bind));
#ifdef HAVE_TLS
/* load TLS plugin */
if( ! (lib = dlopen("uhttpd_tls.so", RTLD_LAZY | RTLD_GLOBAL)) )
{
fprintf(stderr,
"Notice: Unable to load TLS plugin - disabling SSL support! "
"(Reason: %s)\n", dlerror()
);
}
else
{
/* resolve functions */
if( !(conf.tls_init = dlsym(lib, "uh_tls_ctx_init")) ||
!(conf.tls_cert = dlsym(lib, "uh_tls_ctx_cert")) ||
!(conf.tls_key = dlsym(lib, "uh_tls_ctx_key")) ||
!(conf.tls_free = dlsym(lib, "uh_tls_ctx_free")) ||
!(conf.tls_accept = dlsym(lib, "uh_tls_client_accept")) ||
!(conf.tls_close = dlsym(lib, "uh_tls_client_close")) ||
!(conf.tls_recv = dlsym(lib, "uh_tls_client_recv")) ||
!(conf.tls_send = dlsym(lib, "uh_tls_client_send"))
) {
fprintf(stderr,
"Error: Failed to lookup required symbols "
"in TLS plugin: %s\n", dlerror()
);
exit(1);
}
/* init SSL context */
if( ! (conf.tls = conf.tls_init()) )
{
fprintf(stderr, "Error: Failed to initalize SSL context\n");
exit(1);
}
}
#endif
while( (opt = getopt(argc, argv, while( (opt = getopt(argc, argv,
"fSDRC:K:E:I:p:s:h:c:l:L:d:r:m:x:i:t:T:A:")) > 0 "fSDRC:K:E:I:p:s:h:c:l:L:d:r:m:x:i:t:T:A:")) > 0
@ -750,7 +764,7 @@ int main (int argc, char **argv)
#ifdef HAVE_TLS #ifdef HAVE_TLS
if( opt == 's' ) if( opt == 's' )
{ {
if( !conf.tls ) if( uh_inittls(&conf) )
{ {
fprintf(stderr, fprintf(stderr,
"Notice: TLS support is disabled, " "Notice: TLS support is disabled, "
@ -775,7 +789,7 @@ int main (int argc, char **argv)
#ifdef HAVE_TLS #ifdef HAVE_TLS
/* certificate */ /* certificate */
case 'C': case 'C':
if( conf.tls ) if( !uh_inittls(&conf) )
{ {
if( conf.tls_cert(conf.tls, optarg) < 1 ) if( conf.tls_cert(conf.tls, optarg) < 1 )
{ {
@ -791,7 +805,7 @@ int main (int argc, char **argv)
/* key */ /* key */
case 'K': case 'K':
if( conf.tls ) if( !uh_inittls(&conf) )
{ {
if( conf.tls_key(conf.tls, optarg) < 1 ) if( conf.tls_key(conf.tls, optarg) < 1 )
{ {
@ -912,8 +926,14 @@ int main (int argc, char **argv)
case 'd': case 'd':
if( (port = malloc(strlen(optarg)+1)) != NULL ) if( (port = malloc(strlen(optarg)+1)) != NULL )
{ {
/* "decode" plus to space to retain compat */
for (opt = 0; optarg[opt]; opt++)
if (optarg[opt] == '+')
optarg[opt] = ' ';
memset(port, 0, strlen(optarg)+1); memset(port, 0, strlen(optarg)+1);
uh_urldecode(port, strlen(optarg), optarg, strlen(optarg)); uh_urldecode(port, strlen(optarg), optarg, strlen(optarg));
printf("%s", port); printf("%s", port);
free(port); free(port);
exit(0); exit(0);