Force IPv4 for sptps-basic.test.

Allow forcing either IPv4 or IPv6 for sptps_test, and use IPv4 for the
sptps-basic test. Since sptps_test is only opening a single listening
socket, and you cannot control which address family it uses, this gets
around a problem where the listening side is using a different address
family than the one connecting to it.

diff --git a/src/sptps_test.c b/src/sptps_test.c
index a3941758398a44f2d49745db9683540863a1b963..3a72f1d6fb7a6a624b8e1a6d173fed476fc7eee4 100644 (file)
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -44,6 +44,7 @@ static bool readonly;
 static bool writeonly;
 static int in = 0;
 static int out = 1;
+static int addressfamily = AF_UNSPEC;
 
 static bool send_data(void *handle, uint8_t type, const void *data, size_t len) {
        char hex[len * 2 + 1];
@@ -93,6 +94,8 @@ static void usage() {
                        "  -R, --replay-window N   Set replay window to N bytes.\n"
                        "  -s, --special           Enable special handling of lines starting with #, ^ and $.\n"
                        "  -v, --verbose           Display debug messages.\n"
+                       "  -4                      Use IPv4.\n"
+                       "  -6                      Use IPv6.\n"
                        "\n");
        fprintf(stderr, "Report bugs to tinc@tinc-vpn.org.\n");
 }
@@ -110,7 +113,7 @@ int main(int argc, char *argv[]) {
        ecdsa_t *mykey = NULL, *hiskey = NULL;
        bool quit = false;
 
-       while((r = getopt_long(argc, argv, "dqrstwL:W:v", long_options, &option_index)) != EOF) {
+       while((r = getopt_long(argc, argv, "dqrstwL:W:v46", long_options, &option_index)) != EOF) {
                switch (r) {
                        case 0:   /* long option */
                                break;
@@ -161,6 +164,14 @@ int main(int argc, char *argv[]) {
                                usage();
                                return 1;
 
+                       case '4': /* IPv4 */
+                               addressfamily = AF_INET;
+                               break;
+
+                       case '6': /* IPv6 */
+                               addressfamily = AF_INET6;
+                               break;
+
                        case 1: /* help */
                                usage();
                                return 0;
@@ -212,7 +223,7 @@ int main(int argc, char *argv[]) {
        struct addrinfo *ai, hint;
        memset(&hint, 0, sizeof hint);
 
-       hint.ai_family = AF_UNSPEC;
+       hint.ai_family = addressfamily;
        hint.ai_socktype = datagram ? SOCK_DGRAM : SOCK_STREAM;
        hint.ai_protocol = datagram ? IPPROTO_UDP : IPPROTO_TCP;
        hint.ai_flags = initiator ? 0 : AI_PASSIVE;

diff --git a/test/sptps-basic.test b/test/sptps-basic.test
index 28c0c4048e3538574a34c242cef00b90a98207f2..9f86c8cd4d38db2051d682ed467c318a7203d83b 100755 (executable)
--- a/test/sptps-basic.test
+++ b/test/sptps-basic.test
@@ -15,18 +15,18 @@ $sptps_keypair $d1/client.priv $d1/client.pub
 
 # Test transfer of a simple file.
 
-(sleep 1; $sptps_test -q $d1/client.priv $d1/server.pub localhost 32750 <../README) &
-$sptps_test $d1/server.priv $d1/client.pub 32750 >$d1/out1
+(sleep 1; $sptps_test -4 -q $d1/client.priv $d1/server.pub localhost 32750 <../README) &
+$sptps_test -4 $d1/server.priv $d1/client.pub 32750 >$d1/out1
 cmp $d1/out1 ../README
 
-$sptps_test -q $d1/server.priv $d1/client.pub 32750 <../NEWS &
+$sptps_test -4 -q $d1/server.priv $d1/client.pub 32750 <../NEWS &
 sleep 1
-$sptps_test $d1/client.priv $d1/server.pub localhost 32750 > $d1/out2
+$sptps_test -4 $d1/client.priv $d1/server.pub localhost 32750 > $d1/out2
 cmp $d1/out2 ../NEWS
 
 # Datagram mode
 
-$sptps_test -dq $d1/server.priv $d1/client.pub 32750 <../COPYING &
+$sptps_test -4 -dq $d1/server.priv $d1/client.pub 32750 <../COPYING &
 sleep 1
-sleep 1 | $sptps_test -dq $d1/client.priv $d1/server.pub localhost 32750 >$d1/out3
+sleep 1 | $sptps_test -4 -dq $d1/client.priv $d1/server.pub localhost 32750 >$d1/out3
 cmp $d1/out3 ../COPYING