Macintosh-SW/lwip-contrib-mac
1
0
Fork 0
mirror of https://github.com/ep00ch/lwip-contrib-mac.git synced 2024-06-12 01:29:28 +00:00
Code Issues Projects Releases Wiki Activity

Fixed compilation after changing netconn_recv/_accept

Browse Source
This commit is contained in:
goldsimon 2010-01-20 07:38:34 +00:00
parent cfcb3da29f
commit f4855e7575
3 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
ports/unix/proj/unixsim/apps/shell.c
View File

@ -52,7 +52,7 @@ struct command {
#undef IP_HDRINCL
#include <stdio.h>
#include <errno.h>
//#include <errno.h>
#include <stdlib.h>
#include <limits.h>
@ -679,6 +679,7 @@ static s8_t
com_acpt(struct command *com)
{
int i, j;
err_t err;
/* Find the first unused connection in conns. */
for(j = 0; j < NCONNS && conns[j] != NULL; j++);
@ -699,12 +700,12 @@ com_acpt(struct command *com)
return ESUCCESS;
}
conns[j] = netconn_accept(conns[i]);
err = netconn_accept(conns[i], &conns[j]);
if (conns[j] == NULL) {
if (err != ERR_OK) {
sendstr("Could not accept connection: ", com->conn);
#ifdef LWIP_DEBUG
sendstr(lwip_strerr(netconn_err(conns[i])), com->conn);
sendstr(lwip_strerr(err), com->conn);
#else
sendstr("(debugging must be turned on for error message to appear)", com->conn);
#endif /* LWIP_DEBUG */
@ -806,8 +807,8 @@ com_recv(struct command *com)
return ESUCCESS;
}
buf = netconn_recv(conns[i]);
if (buf != NULL) {
err = netconn_recv(conns[i], &buf);
if (err == ERR_OK) {
netbuf_copy(buf, buffer, 1024);
len = netbuf_len(buf);
@ -1235,10 +1236,10 @@ parse_command(struct command *com, u32_t len)
buffer[bufp] == '\n') {
buffer[bufp] = 0;
if (i < com->nargs - 1) {
return ETOOFEW;
return ETOOFEW;
}
if (i > com->nargs - 1) {
return ETOOMANY;
return ETOOMANY;
}
break;
}
@ -1247,9 +1248,9 @@ parse_command(struct command *com, u32_t len)
}
com->args[i] = (char *)&buffer[bufp];
for(; bufp < len && buffer[bufp] != ' ' && buffer[bufp] != '\r' &&
buffer[bufp] != '\n'; bufp++) {
buffer[bufp] != '\n'; bufp++) {
if (buffer[bufp] == '\\') {
buffer[bufp] = ' ';
buffer[bufp] = ' ';
}
}
if (bufp > len) {
@ -1296,43 +1297,44 @@ shell_main(struct netconn *conn)
struct command com;
s8_t err;
int i;
err_t ret;
do {
buf = netconn_recv(conn);
if (buf != NULL) {
ret = netconn_recv(conn, &buf);
if (ret == ERR_OK) {
netbuf_copy(buf, buffer, 1024);
len = netbuf_len(buf);
netbuf_delete(buf);
if (len >= 4) {
if (buffer[0] != 0xff &&
buffer[1] != 0xfe) {
err = parse_command(&com, len);
if (err == ESUCCESS) {
com.conn = conn;
err = com.exec(&com);
}
if (err != ESUCCESS) {
error(err, conn);
}
if (err == ECLOSED) {
printf("Closed\n");
error(err, conn);
goto close;
}
} else {
sendstr("\n\n"
"lwIP simple interactive shell.\n"
"(c) Copyright 2001, Swedish Institute of Computer Science.\n"
"Written by Adam Dunkels.\n"
"For help, try the \"help\" command.\n", conn);
}
if (buffer[0] != 0xff &&
buffer[1] != 0xfe) {
err = parse_command(&com, len);
if (err == ESUCCESS) {
com.conn = conn;
err = com.exec(&com);
}
if (err != ESUCCESS) {
error(err, conn);
}
if (err == ECLOSED) {
printf("Closed\n");
error(err, conn);
goto close;
}
} else {
sendstr("\n\n"
"lwIP simple interactive shell.\n"
"(c) Copyright 2001, Swedish Institute of Computer Science.\n"
"Written by Adam Dunkels.\n"
"For help, try the \"help\" command.\n", conn);
}
}
}
if (buf != NULL) {
if (ret == ERR_OK) {
prompt(conn);
}
} while (buf != NULL);
printf("buf == NULL err %s\n", lwip_strerr(conn->err));
} while (ret == ERR_OK);
printf("err %s\n", lwip_strerr(ret));
close:
netconn_close(conn);
@ -1349,20 +1351,24 @@ static void
shell_thread(void *arg)
{
struct netconn *conn, *newconn;
err_t err;
LWIP_UNUSED_ARG(arg);
conn = netconn_new(NETCONN_TCP);
netconn_bind(conn, NULL, 23);
netconn_listen(conn);
while (1) {
newconn = netconn_accept(conn);
shell_main(newconn);
netconn_delete(newconn);
err = netconn_accept(conn, &newconn);
if (err == ERR_OK) {
shell_main(newconn);
netconn_delete(newconn);
}
}
}
/*-----------------------------------------------------------------------------------*/
void
shell_init(void)
shell_init(void)
{
sys_thread_new("shell_thread", shell_thread, NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO);
}

13
ports/unix/proj/unixsim/apps/tcpecho.c
View File

@ -38,6 +38,7 @@ tcpecho_thread(void *arg)
{
struct netconn *conn, *newconn;
err_t err;
LWIP_UNUSED_ARG(arg);
/* Create a new connection identifier. */
conn = netconn_new(NETCONN_TCP);
@ -51,26 +52,26 @@ tcpecho_thread(void *arg)
while (1) {
/* Grab new connection. */
newconn = netconn_accept(conn);
err = netconn_accept(conn, &newconn);
/*printf("accepted new connection %p\n", newconn);*/
/* Process the new connection. */
if (newconn != NULL) {
if (err == ERR_OK) {
struct netbuf *buf;
void *data;
u16_t len;
while ((buf = netconn_recv(newconn)) != NULL) {
while ((err = netconn_recv(newconn, &buf)) == ERR_OK) {
/*printf("Recved\n");*/
do {
netbuf_data(buf, &data, &len);
err = netconn_write(newconn, data, len, NETCONN_COPY);
#if 0
if (err != ERR_OK) {
if (err != ERR_OK) {
printf("tcpecho: netconn_write: error \"%s\"\n", lwip_strerr(err));
}
#endif
} while (netbuf_next(buf) >= 0);
netbuf_delete(buf);
netbuf_delete(buf);
}
/*printf("Got EOF, looping\n");*/
/* Close connection and discard connection identifier. */
@ -83,7 +84,7 @@ tcpecho_thread(void *arg)
void
tcpecho_init(void)
{
sys_thread_new("tcpecho_thread", tcpecho_thread, NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO);
sys_thread_new("tcpecho_thread", tcpecho_thread, NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO);
}
/*-----------------------------------------------------------------------------------*/

24
ports/unix/proj/unixsim/apps/udpecho.c
View File

@ -42,20 +42,24 @@ udpecho_thread(void *arg)
static struct ip_addr *addr;
static unsigned short port;
char buffer[4096];
err_t err;
LWIP_UNUSED_ARG(arg);
conn = netconn_new(NETCONN_UDP);
netconn_bind(conn, NULL, 7);
while (1) {
buf = netconn_recv(conn);
addr = netbuf_fromaddr(buf);
port = netbuf_fromport(buf);
netconn_connect(conn, addr, port);
netbuf_copy(buf, buffer, buf->p->tot_len);
buffer[buf->p->tot_len] = '\0';
netconn_send(conn, buf);
printf("got %s\n", buffer);
netbuf_delete(buf);
err = netconn_recv(conn, &buf);
if (err == ERR_OK) {
addr = netbuf_fromaddr(buf);
port = netbuf_fromport(buf);
netconn_connect(conn, addr, port);
netbuf_copy(buf, buffer, buf->p->tot_len);
buffer[buf->p->tot_len] = '\0';
netconn_send(conn, buf);
printf("got %s\n", buffer);
netbuf_delete(buf);
}
}
}
/*-----------------------------------------------------------------------------------*/