diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-07-12 20:01:35 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-07-12 20:01:35 +0000 |
commit | 83ca6077757bbdf034077805b2cb999a94fb1226 (patch) | |
tree | 1c9f6ea3a56d5cf0ed0f1e4e3ea3166843adec69 | |
parent | 2007-07-12 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-83ca6077757bbdf034077805b2cb999a94fb1226.tar.bz2 |
2007-07-12 Joel Sherrill <joel.sherrill@oarcorp.com>
* shttpd/compat_rtems.c, shttpd/compat_rtems.h: Add port to listen on
to shttpd initialization.
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/shttpd/compat_rtems.c | 11 | ||||
-rw-r--r-- | cpukit/shttpd/compat_rtems.h | 3 |
3 files changed, 14 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 0910148134..34241799f8 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2007-07-12 Joel Sherrill <joel.sherrill@oarcorp.com> + + * shttpd/compat_rtems.c, shttpd/compat_rtems.h: Add port to listen on + to shttpd initialization. + 2007-07-11 Joel Sherrill <joel.sherrill@oarcorp.com> * libcsupport/src/malloc.c: Clean up Malloc debug code. diff --git a/cpukit/shttpd/compat_rtems.c b/cpukit/shttpd/compat_rtems.c index 3fed5495d1..e3bd11f564 100644 --- a/cpukit/shttpd/compat_rtems.c +++ b/cpukit/shttpd/compat_rtems.c @@ -26,12 +26,13 @@ typedef struct RTEMS_HTTPD_ARGS { rtems_shttpd_init init_callback; rtems_shttpd_addpages addpages_callback; + unsigned int port; char webroot[MAX_WEB_BASE_PATH_LENGTH]; } RTEMS_HTTPD_ARGS; static int rtems_webserver_running = FALSE; //not running. -static rtems_task rtems_httpd_daemon(rtems_task_argument args ) +static rtems_task rtems_httpd_daemon(rtems_task_argument args) { RTEMS_HTTPD_ARGS *httpd_args = (RTEMS_HTTPD_ARGS*)args; @@ -59,7 +60,7 @@ static rtems_task rtems_httpd_daemon(rtems_task_argument args ) free(httpd_args); /* Open listening socket */ - shttpd_listen(ctx, 9000); + shttpd_listen(ctx, httpd_args->port); rtems_webserver_running = TRUE; @@ -79,7 +80,8 @@ rtems_status_code rtems_initialize_webserver(rtems_task_priority initial_prior rtems_attribute attribute_set, rtems_shttpd_init init_callback, rtems_shttpd_addpages addpages_callback, - char *webroot + char *webroot, + unsigned int port ) { rtems_status_code sc; @@ -95,6 +97,7 @@ rtems_status_code rtems_initialize_webserver(rtems_task_priority initial_prior { args->init_callback = init_callback; args->addpages_callback = addpages_callback; + args->port = port; strncpy(args->webroot,webroot,MAX_WEB_BASE_PATH_LENGTH); sc = rtems_task_create(rtems_build_name('H', 'T', 'P', 'D'), @@ -119,7 +122,7 @@ rtems_status_code rtems_initialize_webserver(rtems_task_priority initial_prior void rtems_terminate_webserver(void) { - rtems_webserver_running = FALSE; //not running, so terminate + rtems_webserver_running = FALSE; // not running, so terminate } int rtems_webserver_ok(void) diff --git a/cpukit/shttpd/compat_rtems.h b/cpukit/shttpd/compat_rtems.h index 1c32fea0d2..6842bb97ed 100644 --- a/cpukit/shttpd/compat_rtems.h +++ b/cpukit/shttpd/compat_rtems.h @@ -56,7 +56,8 @@ rtems_status_code rtems_initialize_webserver(rtems_task_priority initial_prior rtems_attribute attribute_set, rtems_shttpd_init init_callback, rtems_shttpd_addpages addpages_callback, - char *webroot + char *webroot, + unsigned int port ); void rtems_terminate_webserver(void); int rtems_webserver_ok(void); |