From 9a272c38fb40781171f7b4d054430f2c0be730c0 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 2 Sep 2007 21:58:35 +0000 Subject: Implements basic TCP connection logic git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@326 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/netutils/resolv/resolv.c | 1 + nuttx/netutils/smtp/smtp.c | 44 +++++++--- nuttx/netutils/webclient/webclient.c | 42 ++++++--- nuttx/netutils/webserver/httpd-cgi.c | 162 ++++++++++++++++++----------------- 4 files changed, 148 insertions(+), 101 deletions(-) (limited to 'nuttx/netutils') diff --git a/nuttx/netutils/resolv/resolv.c b/nuttx/netutils/resolv/resolv.c index 14159e906..f149c6a80 100644 --- a/nuttx/netutils/resolv/resolv.c +++ b/nuttx/netutils/resolv/resolv.c @@ -52,6 +52,7 @@ #include #include +#include #include #include diff --git a/nuttx/netutils/smtp/smtp.c b/nuttx/netutils/smtp/smtp.c index 8ea6ca275..09d131057 100644 --- a/nuttx/netutils/smtp/smtp.c +++ b/nuttx/netutils/smtp/smtp.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -260,17 +261,10 @@ void smtp_configure(void *handle, char *lhostname, void *server) int smtp_send(void *handle, char *to, char *cc, char *from, char *subject, char *msg, int msglen) { struct smtp_state *psmtp = (struct smtp_state *)handle; - struct uip_conn *conn; + struct sockaddr_in server; + int sockfd; - /* This is the moral equivalent of socket() + bind(). It returns the - * initialized connection structure - */ - - conn = uip_connect(&psmtp->smtpserver, HTONS(25)); - if (conn == NULL) - { - return ERROR; - } + /* Setup */ psmtp->connected = TRUE; psmtp->to = to; @@ -281,11 +275,35 @@ int smtp_send(void *handle, char *to, char *cc, char *from, char *subject, char psmtp->msglen = msglen; psmtp->result = OK; - /* Make this instance globally visible */ + /* Create a socket */ + + sockfd = socket(AF_INET, SOCK_STREAM, 0); + if (sockfd < 0) + { + return ERROR; + } - gpsmtp = psmtp; + /* Make this instance globally visible (we will get interrupts as + * soon as we connect + */ + + gpsmtp = psmtp; + + /* Connect to server. First we have to set some fields in the + * 'server' structure. The system will assign me an arbitrary + * local port that is not in use. + */ + + server.sin_family = AF_INET; + memcpy(&server.sin_addr.s_addr, &psmtp->smtpserver, sizeof(in_addr_t)); + server.sin_port = HTONS(25); + + if (connect(sockfd, (struct sockaddr *)&server, sizeof(struct sockaddr_in)) < 0) + { + return ERROR; + } - /* Initialized the psock structure inside the smtp state structure */ + /* Initialize the psock structure inside the smtp state structure */ psock_init(&psmtp->psock, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE); diff --git a/nuttx/netutils/webclient/webclient.c b/nuttx/netutils/webclient/webclient.c index 30718e723..a89647ab5 100644 --- a/nuttx/netutils/webclient/webclient.c +++ b/nuttx/netutils/webclient/webclient.c @@ -38,12 +38,13 @@ * * This file is part of the uIP TCP/IP stack. * - * $Id: webclient.c,v 1.1.1.1 2007-08-26 23:07:05 patacongo Exp $ + * $Id: webclient.c,v 1.2 2007-09-02 21:58:34 patacongo Exp $ * */ #include #include +#include #include #include @@ -118,24 +119,43 @@ void webclient_close(void) unsigned char webclient_get(char *host, uint16 port, char *file) { - struct uip_conn *conn; uip_ipaddr_t *ipaddr; static uip_ipaddr_t addr; + struct sockaddr_in server; + int sockfd; /* First check if the host is an IP address. */ + ipaddr = &addr; - if (uiplib_ipaddrconv(host, (unsigned char *)addr) == 0) { - ipaddr = (uip_ipaddr_t *)resolv_lookup(host); + if (uiplib_ipaddrconv(host, (unsigned char *)addr) == 0) + { + ipaddr = (uip_ipaddr_t *)resolv_lookup(host); - if (ipaddr == NULL) { - return 0; - } + if (ipaddr == NULL) { + return 0; + } } - conn = uip_connect(ipaddr, htons(port)); + /* Create a socket */ - if (conn == NULL) { - return 0; + sockfd = socket(AF_INET, SOCK_STREAM, 0); + if (sockfd < 0) + { + return ERROR; + } + + /* Connect to server. First we have to set some fields in the + * 'server' structure. The system will assign me an arbitrary + * local port that is not in use. + */ + + server.sin_family = AF_INET; + memcpy(&server.sin_addr.s_addr, &host, sizeof(in_addr_t)); + server.sin_port = htons(port); + + if (connect(sockfd, (struct sockaddr *)&server, sizeof(struct sockaddr_in)) < 0) + { + return ERROR; } s.port = port; @@ -143,7 +163,7 @@ unsigned char webclient_get(char *host, uint16 port, char *file) strncpy(s.host, host, sizeof(s.host)); init_connection(); - return 1; + return OK; } static char *copy_string(char *dest, const char *src, int len) diff --git a/nuttx/netutils/webserver/httpd-cgi.c b/nuttx/netutils/webserver/httpd-cgi.c index 5c9609ee7..2b68040a2 100644 --- a/nuttx/netutils/webserver/httpd-cgi.c +++ b/nuttx/netutils/webserver/httpd-cgi.c @@ -39,21 +39,73 @@ #include #include +#define CONFIG_HTTPDCGI_FILESTATS 1 +#undef CONFIG_HTTPDCGI_DCPSTATS +#define CONFIG_HTTPDCGI_NETSTATS 1 + HTTPD_CGI_CALL(file, "file-stats", file_stats); +#if CONFIG_HTTPDCGI_TCPSTATS HTTPD_CGI_CALL(tcp, "tcp-connections", tcp_stats); +#endif HTTPD_CGI_CALL(net, "net-stats", net_stats); +#if 0 /* Revisit */ static const struct httpd_cgi_call *calls[] = { &file, &tcp, &net, NULL }; +#else +static const struct httpd_cgi_call *calls[] = { + +#ifdef CONFIG_HTTPDCGI_FILESTATS + &file, +#endif +#ifdef CONFIG_HTTPDCGI_DCPSTATS + &tcp, +#endif +#ifdef CONFIG_HTTPDCGI_NETSTATS + &net, +#endif + NULL +}; +#endif + +static const char closed[] = /* "CLOSED",*/ +{0x43, 0x4c, 0x4f, 0x53, 0x45, 0x44, 0}; +static const char syn_rcvd[] = /* "SYN-RCVD",*/ +{0x53, 0x59, 0x4e, 0x2d, 0x52, 0x43, 0x56, 0x44, 0}; +static const char syn_sent[] = /* "SYN-SENT",*/ +{0x53, 0x59, 0x4e, 0x2d, 0x53, 0x45, 0x4e, 0x54, 0}; +static const char established[] = /* "ESTABLISHED",*/ +{0x45, 0x53, 0x54, 0x41, 0x42, 0x4c, 0x49, 0x53, 0x48, 0x45, 0x44, 0}; +static const char fin_wait_1[] = /* "FIN-WAIT-1",*/ +{0x46, 0x49, 0x4e, 0x2d, 0x57, 0x41, 0x49, 0x54, 0x2d, 0x31, 0}; +static const char fin_wait_2[] = /* "FIN-WAIT-2",*/ +{0x46, 0x49, 0x4e, 0x2d, 0x57, 0x41, 0x49, 0x54, 0x2d, 0x32, 0}; +static const char closing[] = /* "CLOSING",*/ +{0x43, 0x4c, 0x4f, 0x53, 0x49, 0x4e, 0x47, 0}; +static const char time_wait[] = /* "TIME-WAIT,"*/ +{0x54, 0x49, 0x4d, 0x45, 0x2d, 0x57, 0x41, 0x49, 0x54, 0}; +static const char last_ack[] = /* "LAST-ACK"*/ +{0x4c, 0x41, 0x53, 0x54, 0x2d, 0x41, 0x43, 0x4b, 0}; -/*---------------------------------------------------------------------------*/ -static -void nullfunction(struct httpd_state *s, char *ptr) +#if CONFIG_HTTPDCGI_TCPSTATS +static const char *states[] = +{ + closed, + syn_rcvd, + syn_sent, + established, + fin_wait_1, + fin_wait_2, + closing, + time_wait, + last_ack +}; +#endif + +static void nullfunction(struct httpd_state *s, char *ptr) { } -/*---------------------------------------------------------------------------*/ -httpd_cgifunction -httpd_cgi(char *name) +httpd_cgifunction httpd_cgi(char *name) { const struct httpd_cgi_call **f; @@ -66,66 +118,26 @@ httpd_cgi(char *name) #warning REVISIT -- must wait to return return nullfunction; } -/*---------------------------------------------------------------------------*/ -static unsigned short -generate_file_stats(void *arg) + +#ifdef CONFIG_HTTPDCGI_FILESTATS +static unsigned short generate_file_stats(void *arg) { char *f = (char *)arg; return snprintf((char *)uip_appdata, UIP_APPDATA_SIZE, "%5u", httpd_fs_count(f)); } -/*---------------------------------------------------------------------------*/ -static -void file_stats(struct httpd_state *s, char *ptr) + +static void file_stats(struct httpd_state *s, char *ptr) { psock_generator_send(&s->sout, generate_file_stats, strchr(ptr, ' ') + 1); } +#endif -/*---------------------------------------------------------------------------*/ -static const char closed[] = /* "CLOSED",*/ -{0x43, 0x4c, 0x4f, 0x53, 0x45, 0x44, 0}; -static const char syn_rcvd[] = /* "SYN-RCVD",*/ -{0x53, 0x59, 0x4e, 0x2d, 0x52, 0x43, 0x56, - 0x44, 0}; -static const char syn_sent[] = /* "SYN-SENT",*/ -{0x53, 0x59, 0x4e, 0x2d, 0x53, 0x45, 0x4e, - 0x54, 0}; -static const char established[] = /* "ESTABLISHED",*/ -{0x45, 0x53, 0x54, 0x41, 0x42, 0x4c, 0x49, 0x53, 0x48, - 0x45, 0x44, 0}; -static const char fin_wait_1[] = /* "FIN-WAIT-1",*/ -{0x46, 0x49, 0x4e, 0x2d, 0x57, 0x41, 0x49, - 0x54, 0x2d, 0x31, 0}; -static const char fin_wait_2[] = /* "FIN-WAIT-2",*/ -{0x46, 0x49, 0x4e, 0x2d, 0x57, 0x41, 0x49, - 0x54, 0x2d, 0x32, 0}; -static const char closing[] = /* "CLOSING",*/ -{0x43, 0x4c, 0x4f, 0x53, 0x49, - 0x4e, 0x47, 0}; -static const char time_wait[] = /* "TIME-WAIT,"*/ -{0x54, 0x49, 0x4d, 0x45, 0x2d, 0x57, 0x41, - 0x49, 0x54, 0}; -static const char last_ack[] = /* "LAST-ACK"*/ -{0x4c, 0x41, 0x53, 0x54, 0x2d, 0x41, 0x43, - 0x4b, 0}; - -static const char *states[] = { - closed, - syn_rcvd, - syn_sent, - established, - fin_wait_1, - fin_wait_2, - closing, - time_wait, - last_ack}; - - -static unsigned short -generate_tcp_stats(void *arg) +#if CONFIG_HTTPDCGI_TCPSTATS +static unsigned short generate_tcp_stats(void *arg) { struct uip_conn *conn; struct httpd_state *s = (struct httpd_state *)arg; - + conn = &uip_conns[s->count]; return snprintf((char *)uip_appdata, UIP_APPDATA_SIZE, "%d%u.%u.%u.%u:%u%s%u%u%c %c\r\n", @@ -141,38 +153,34 @@ generate_tcp_stats(void *arg) (uip_outstanding(conn))? '*':' ', (uip_stopped(conn))? '!':' '); } -/*---------------------------------------------------------------------------*/ -static -void tcp_stats(struct httpd_state *s, char *ptr) + +static void tcp_stats(struct httpd_state *s, char *ptr) { - for(s->count = 0; s->count < UIP_CONNS; ++s->count) { - if((uip_conns[s->count].tcpstateflags & UIP_TS_MASK) != UIP_CLOSED) { - psock_generator_send(&s->sout, generate_tcp_stats, s); + for(s->count = 0; s->count < UIP_CONNS; ++s->count) + { + if((uip_conns[s->count].tcpstateflags & UIP_TS_MASK) != UIP_CLOSED) + { + psock_generator_send(&s->sout, generate_tcp_stats, s); + } } - } } +#endif -/*---------------------------------------------------------------------------*/ -static unsigned short -generate_net_stats(void *arg) +#ifdef CONFIG_HTTPDCGI_NETSTATS +static unsigned short generate_net_stats(void *arg) { struct httpd_state *s = (struct httpd_state *)arg; - return snprintf((char *)uip_appdata, UIP_APPDATA_SIZE, + return snprintf((char*)uip_appdata, UIP_APPDATA_SIZE, "%5u\n", ((uip_stats_t *)&uip_stat)[s->count]); } -static -void net_stats(struct httpd_state *s, char *ptr) +static void net_stats(struct httpd_state *s, char *ptr) { #if UIP_STATISTICS - - for(s->count = 0; s->count < sizeof(uip_stat) / sizeof(uip_stats_t); - ++s->count) { - psock_generator_send(&s->sout, generate_net_stats, s); - } - + for(s->count = 0; s->count < sizeof(uip_stat) / sizeof(uip_stats_t); ++s->count) + { + psock_generator_send(&s->sout, generate_net_stats, s); + } #endif /* UIP_STATISTICS */ } - -/*---------------------------------------------------------------------------*/ -/** @} */ +#endif -- cgit v1.2.3