Make the UDP senddata() methods return a status code.

udp_connect() now follows the standard BSD sockets semantics and simply
sets the default address for outgoing packets; it doesn't filter incoming
packets.
This commit is contained in:
Michael Brown
2006-08-03 23:10:14 +00:00
parent a0a872f7f1
commit ffe0e24249
4 changed files with 19 additions and 36 deletions

View File

@@ -66,18 +66,6 @@ void udp_connect ( struct udp_connection *conn, struct sockaddr_tcpip *peer ) {
memcpy ( &conn->peer, peer, sizeof ( conn->peer ) );
}
/**
* Connect UDP connection to all remote hosts and ports
*
* @v conn UDP connection
*
* This undoes the effect of a call to udp_connect(), i.e. allows the
* connection to receive packets from all remote hosts and ports.
*/
void udp_connect_promisc ( struct udp_connection *conn ) {
memset ( &conn->peer, 0, sizeof ( conn->peer ) );
}
/**
* Open a local port
*
@@ -140,9 +128,8 @@ int udp_senddata ( struct udp_connection *conn ) {
return -ENOMEM;
}
pkb_reserve ( conn->tx_pkb, UDP_MAX_HLEN );
conn->udp_op->senddata ( conn, conn->tx_pkb->data,
pkb_available ( conn->tx_pkb ) );
return 0;
return conn->udp_op->senddata ( conn, conn->tx_pkb->data,
pkb_available ( conn->tx_pkb ) );
}
/**
@@ -271,14 +258,6 @@ static int udp_rx ( struct pk_buff *pkb, struct sockaddr_tcpip *st_src,
/* Bound to local port and local port doesn't match */
continue;
}
if ( conn->peer.st_family &&
( memcmp ( &conn->peer, st_src,
sizeof ( conn->peer ) ) != 0 ) ) {
/* Connected to remote port and remote port
* doesn't match
*/
continue;
}
/* Strip off the UDP header */
pkb_pull ( pkb, sizeof ( *udphdr ) );

View File

@@ -508,9 +508,10 @@ static union {
* @v conn UDP connection
* @v buf Temporary data buffer
* @v len Length of temporary data buffer
* @ret rc Return status code
*/
static void dhcp_senddata ( struct udp_connection *conn,
void *buf, size_t len ) {
static int dhcp_senddata ( struct udp_connection *conn,
void *buf, size_t len ) {
struct dhcp_session *dhcp = udp_to_dhcp ( conn );
struct dhcp_packet dhcppkt;
int rc;
@@ -524,14 +525,14 @@ static void dhcp_senddata ( struct udp_connection *conn,
if ( ( rc = create_dhcp_packet ( dhcp, dhcp->state, buf, len,
&dhcppkt ) ) != 0 ) {
DBG ( "Could not create DHCP packet\n" );
return;
return rc;
}
/* Copy in options common to all requests */
if ( ( rc = copy_dhcp_packet_options ( &dhcppkt,
&dhcp_request_options ) ) != 0){
DBG ( "Could not set common DHCP options\n" );
return;
return rc;
}
/* Copy any required options from previous server repsonse */
@@ -540,13 +541,13 @@ static void dhcp_senddata ( struct udp_connection *conn,
DHCP_SERVER_IDENTIFIER,
DHCP_SERVER_IDENTIFIER ) ) != 0 ) {
DBG ( "Could not set server identifier option\n" );
return;
return rc;
}
if ( ( rc = copy_dhcp_packet_option ( &dhcppkt, dhcp->options,
DHCP_EB_YIADDR,
DHCP_REQUESTED_ADDRESS ) ) != 0 ) {
DBG ( "Could not set requested address option\n" );
return;
return rc;
}
}
@@ -554,8 +555,10 @@ static void dhcp_senddata ( struct udp_connection *conn,
if ( ( rc = udp_sendto ( conn, &sa_dhcp_server.st,
dhcppkt.dhcphdr, dhcppkt.len ) ) != 0 ) {
DBG ( "Could not transmit UDP packet\n" );
return;
return rc;
}
return 0;
}
/**