Eliminate PF_INET; just use the AF_INET from the struct sockaddr instead.

1 files changed, 11 insertions, 13 deletions

diff --git a/src/core/open.c b/src/core/open.c
index 284d00a98..b61160eb2 100644
--- a/src/core/open.c
+++ b/src/core/open.c
@@ -75,30 +75,29 @@ int xfer_open_uri ( struct xfer_interface *xfer, const char *uri_string ) {
  * Open socket
  *
  * @v xfer		Data transfer interface
- * @v domain		Communication domain (e.g. PF_INET)
- * @v type		Communication semantics (e.g. SOCK_STREAM)
+ * @v semantics		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 domain, int type, struct sockaddr *peer,
-		       struct sockaddr *local ) {
+int xfer_open_socket ( struct xfer_interface *xfer, int semantics,
+		       struct sockaddr *peer, struct sockaddr *local ) {
 	struct socket_opener *opener;
 
 	DBGC ( xfer, "XFER %p opening (%s,%s) socket\n", xfer,
-	       socket_domain_name ( domain ), socket_type_name ( type ) );
+	       socket_semantics_name ( semantics ),
+	       socket_family_name ( peer->sa_family ) );
 
 	for ( opener = socket_openers; opener < socket_openers_end; opener++ ){
-		if ( ( opener->domain == domain ) &&
-		     ( opener->type == type ) ) {
+		if ( ( opener->semantics == semantics ) &&
+		     ( opener->family == peer->sa_family ) ) {
 			return opener->open ( xfer, peer, local );
 		}
 	}
 
 	DBGC ( xfer, "XFER %p attempted to open unsupported socket type "
-	       "(%s,%s)\n", xfer, socket_domain_name ( domain ),
-	       socket_type_name ( type ) );
+	       "(%s,%s)\n", xfer, socket_semantics_name ( semantics ),
+	       socket_family_name ( peer->sa_family ) );
 	return -ENOTSUP;
 }
 
@@ -117,12 +116,11 @@ int xfer_vopen ( struct xfer_interface *xfer, int type, va_list args ) {
 
 		return xfer_open_uri ( xfer, uri_string ); }
 	case LOCATION_SOCKET: {
-		int domain = va_arg ( args, int );
-		int type = va_arg ( args, int );
+		int semantics = va_arg ( args, int );
 		struct sockaddr *peer = va_arg ( args, struct sockaddr * );
 		struct sockaddr *local = va_arg ( args, struct sockaddr * );
 
-		return xfer_open_socket ( xfer, domain, type, peer, local ); }
+		return xfer_open_socket ( xfer, semantics, peer, local ); }
 	default:
 		DBGC ( xfer, "XFER %p attempted to open unsupported location "
 		       "type %d\n", xfer, type );