SocketPool - prefer user given TLS options regarding SSL_hostname and…

… SSL_verifycn_name

Util::INETSOCK - speed up lookup of protocol by caching in hash

lib/Net/SIP/SocketPool.pm

@@ -689,10 +689,10 @@ sub _tls_connect {
     if (!$xxfd) {
 	$DEBUG && DEBUG(40,"upgrade to SSL client");
 	IO::Socket::SSL->start_SSL($fo->{fd},
-	    %{$self->{tls}{c}},
-	    SSL_startHandshake => 0,
 	    SSL_verifycn_name => $fo->{peer}{host},
 	    SSL_hostname => $fo->{peer}{host},
+	    %{$self->{tls}{c}},
+	    SSL_startHandshake => 0,
 	) or die "upgrade to SSL socket failed: $SSL_ERROR";
     }
 

lib/Net/SIP/Util.pm

@@ -28,6 +28,7 @@ BEGIN {
 	AF_INET6();
     }) {
 	$mod6 = 'IO::Socket::IP';
+	my %cached_proto;
 	*INETSOCK = sub {
 	    return IO::Socket::IP->new(@_) if @_ == 1;
 	    # Hack to work around the problem that IO::Socket::IP defaults to
@@ -37,6 +38,11 @@ BEGIN {
 	    my %args = @_;
 	    $args{GetAddrInfoFlags} = 0  if ! defined $args{GetAddrInfoFlags}
 		and $args{Domain} || $args{Family};
+	    # cache IO::Socket::IP protocol lookup to speed it up
+	    $args{Proto} = $cached_proto{$args{Proto}}
+		||= getprotobyname($args{Proto})
+		|| die "Unknown protocol: $args{Proto}"
+		if $args{Proto};
 	    return IO::Socket::IP->new(%args);
 	};