Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-09-27 18:58:27 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Eliminate most uIP globals

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@378 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2007-11-08 16:01:18 +00:00
parent f6547ca194
commit 69cbd66244
21 changed files with 576 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netutils/webserver/httpd.c
+9 -9
View File
@@ -95,7 +95,7 @@ static void next_scriptstate(struct httpd_state *pstate)
pstate->scriptptr = p;
}
static void handle_script(struct httpd_state *pstate)
static void handle_script(struct httpd_state *pstate, struct uip_conn *conn)
{
char *ptr;
@@ -122,8 +122,8 @@ static void handle_script(struct httpd_state *pstate)
/* See if we find the start of script marker in the block of HTML
to be sent. */
if (pstate->file.len > uip_mss()) {
pstate->len = uip_mss();
if (pstate->file.len > uip_mss(conn)) {
pstate->len = uip_mss(conn);
} else {
pstate->len = pstate->file.len;
}
@@ -136,8 +136,8 @@ static void handle_script(struct httpd_state *pstate)
if (ptr != NULL &&
ptr != pstate->file.data) {
pstate->len = (int)(ptr - pstate->file.data);
if (pstate->len >= uip_mss()) {
pstate->len = uip_mss();
if (pstate->len >= uip_mss(conn)) {
pstate->len = uip_mss(conn);
}
}
send_part_of_file(pstate);
@@ -186,7 +186,7 @@ static int send_headers(struct httpd_state *pstate, const char *statushdr)
return ret;
}
static void handle_output(struct httpd_state *pstate)
static void handle_output(struct httpd_state *pstate, struct uip_conn *conn)
{
char *ptr;
@@ -203,7 +203,7 @@ static void handle_output(struct httpd_state *pstate)
ptr = strchr(pstate->filename, ISO_period);
if (ptr != NULL && strncmp(ptr, http_shtml, 6) == 0)
{
handle_script(pstate);
handle_script(pstate, conn);
}
else
{
@@ -266,11 +266,11 @@ static int handle_input(struct httpd_state *pstate)
return OK;
}
static void handle_connection(struct httpd_state *pstate)
static void handle_connection(struct httpd_state *pstate, struct uip_conn *conn)
{
handle_input(pstate);
if (pstate->state == STATE_OUTPUT) {
handle_output(pstate);
handle_output(pstate, conn);
}
}