david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Make tcp_connect() void; it will eventually have no failure case.

This commit is contained in:
Michael Brown 2006-04-30 02:13:52 +00:00
parent 9c9208a132
commit 7af478b30d
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/gpxe/hello.h
View File

@ -41,6 +41,6 @@ struct hello_request {
int complete;
};
extern int hello_connect ( struct hello_request *hello );
extern void hello_connect ( struct hello_request *hello );
#endif

2
src/include/gpxe/tcp.h
View File

@ -94,7 +94,7 @@ struct tcp_connection {
extern void *tcp_buffer;
extern size_t tcp_buflen;
extern int tcp_connect ( struct tcp_connection *conn );
extern void tcp_connect ( struct tcp_connection *conn );
extern void tcp_send ( struct tcp_connection *conn, const void *data,
size_t len );
extern void tcp_close ( struct tcp_connection *conn );

17
src/net/tcp.c
View File

@ -64,18 +64,11 @@ size_t tcp_buflen = UIP_BUFSIZE - ( 40 + UIP_LLH_LEN );
* Open a TCP connection
*
* @v conn TCP connection
* @ret 0 Success
* @ret <0 Failure
*
* This sets up a new TCP connection to the remote host specified in
* tcp_connection::sin. The actual SYN packet will not be sent out
* until run_tcpip() is called for the first time.
*
* @todo Use linked lists instead of a static buffer, and thereby
* remove the only potential failure case, giving this function
* a void return type.
* tcp_connection::sin.
*/
int tcp_connect ( struct tcp_connection *conn ) {
void tcp_connect ( struct tcp_connection *conn ) {
struct uip_conn *uip_conn;
u16_t ipaddr[2];
@ -86,11 +79,9 @@ int tcp_connect ( struct tcp_connection *conn ) {
* ( ( uint32_t * ) ipaddr ) = conn->sin.sin_addr.s_addr;
uip_conn = uip_connect ( ipaddr, conn->sin.sin_port );
if ( ! uip_conn )
return -1;
#warning "Use linked lists so that uip_connect() cannot fail"
assert ( uip_conn != NULL );
*( ( void ** ) uip_conn->appstate ) = conn;
return 0;
}
/**

3
src/proto/iscsi.c
View File

@ -544,8 +544,7 @@ void iscsi_wakeup ( struct iscsi_session *iscsi ) {
switch ( iscsi->state ) {
case ISCSI_STATE_NOT_CONNECTED:
case ISCSI_STATE_FAILED:
if ( tcp_connect ( &iscsi->tcp ) != 0 )
iscsi_fail ( iscsi );
tcp_connect ( &iscsi->tcp );
iscsi_start_login ( iscsi );
break;
case ISCSI_STATE_IDLE: