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

Add local address to socket openers.

Browse Source
This commit is contained in:
Michael Brown 2007-05-19 20:14:18 +00:00
parent 776357214e
commit 5e25a89e74
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/open.c
View File

@ -77,9 +77,13 @@ int xfer_open_uri ( struct xfer_interface *xfer, const char *uri_string ) {
* @v xfer Data transfer interface * @v xfer Data transfer interface
* @v domain Communication domain (e.g. PF_INET) * @v domain Communication domain (e.g. PF_INET)
* @v type Communication semantics (e.g. SOCK_STREAM) * @v type Communication semantics (e.g. SOCK_STREAM)
* @v peer Peer socket address
* @v local Local socket address, or NULL
* @ret rc Return status code
*/ */
int xfer_open_socket ( struct xfer_interface *xfer, int xfer_open_socket ( struct xfer_interface *xfer,
int domain, int type, struct sockaddr *sa ) { int domain, int type, struct sockaddr *peer,
struct sockaddr *local ) {
struct socket_opener *opener; struct socket_opener *opener;
DBGC ( xfer, "XFER %p opening (%s,%s) socket\n", xfer, DBGC ( xfer, "XFER %p opening (%s,%s) socket\n", xfer,
@ -88,7 +92,7 @@ int xfer_open_socket ( struct xfer_interface *xfer,
for ( opener = socket_openers; opener < socket_openers_end; opener++ ){ for ( opener = socket_openers; opener < socket_openers_end; opener++ ){
if ( ( opener->domain == domain ) && if ( ( opener->domain == domain ) &&
( opener->type == type ) ) { ( opener->type == type ) ) {
return opener->open ( xfer, sa ); return opener->open ( xfer, peer, local );
} }
} }
@ -115,9 +119,10 @@ int xfer_vopen ( struct xfer_interface *xfer, int type, va_list args ) {
case LOCATION_SOCKET: { case LOCATION_SOCKET: {
int domain = va_arg ( args, int ); int domain = va_arg ( args, int );
int type = va_arg ( args, int ); int type = va_arg ( args, int );
struct sockaddr *sa = va_arg ( args, struct sockaddr * ); struct sockaddr *peer = va_arg ( args, struct sockaddr * );
struct sockaddr *local = va_arg ( args, struct sockaddr * );
return xfer_open_socket ( xfer, domain, type, sa ); } return xfer_open_socket ( xfer, domain, type, peer, local ); }
default: default:
DBGC ( xfer, "XFER %p attempted to open unsupported location " DBGC ( xfer, "XFER %p attempted to open unsupported location "
"type %d\n", xfer, type ); "type %d\n", xfer, type );

9
src/include/gpxe/open.h
View File

@ -63,10 +63,12 @@ struct socket_opener {
/** Open socket /** Open socket
* *
* @v xfer Data transfer interface * @v xfer Data transfer interface
* @v sa Socket address * @v peer Peer socket address
* @v local Local socket address, or NULL
* @ret rc Return status code * @ret rc Return status code
*/ */
int ( * open ) ( struct xfer_interface *xfer, struct sockaddr *sa ); int ( * open ) ( struct xfer_interface *xfer, struct sockaddr *peer,
struct sockaddr *local );
}; };
/** Register a socket opener */ /** Register a socket opener */
@ -75,7 +77,8 @@ struct socket_opener {
extern int xfer_open_uri ( struct xfer_interface *xfer, extern int xfer_open_uri ( struct xfer_interface *xfer,
const char *uri_string ); const char *uri_string );
extern int xfer_open_socket ( struct xfer_interface *xfer, extern int xfer_open_socket ( struct xfer_interface *xfer,
int domain, int type, struct sockaddr *sa ); int domain, int type, struct sockaddr *peer,
struct sockaddr *local );
extern int xfer_vopen ( struct xfer_interface *xfer, int type, va_list args ); extern int xfer_vopen ( struct xfer_interface *xfer, int type, va_list args );
extern int xfer_open ( struct xfer_interface *xfer, int type, ... ); extern int xfer_open ( struct xfer_interface *xfer, int type, ... );