From 0131659fa627fa1575bc4b82330b1e756324e2d1 Mon Sep 17 00:00:00 2001 From: bert hubert Date: Wed, 2 Apr 2014 23:23:37 +0200 Subject: [PATCH] further enum fixes --- pdns/saxfr.cc | 3 ++- pdns/sdig.cc | 4 ++-- pdns/toysdig.cc | 2 +- pdns/tsig-tests.cc | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pdns/saxfr.cc b/pdns/saxfr.cc index 4bcdfdb09e..396936a4a4 100644 --- a/pdns/saxfr.cc +++ b/pdns/saxfr.cc @@ -38,8 +38,9 @@ try vector packet; DNSPacketWriter pw(packet, argv[3], 252); - Socket sock(InterNetwork, Stream); + ComboAddress dest(argv[1] + (*argv[1]=='@'), atoi(argv[2])); + Socket sock(dest.sin4.sin_family, SOCK_STREAM); sock.connect(dest); uint16_t len; len = htons(packet.size()); diff --git a/pdns/sdig.cc b/pdns/sdig.cc index e5b040823b..08a015cd77 100644 --- a/pdns/sdig.cc +++ b/pdns/sdig.cc @@ -84,7 +84,7 @@ try string reply; if(tcp) { - Socket sock(InterNetwork, Stream); + Socket sock(AF_INET, SOCK_STREAM); ComboAddress dest(argv[1] + (*argv[1]=='@'), atoi(argv[2])); sock.connect(dest); uint16_t len; @@ -113,7 +113,7 @@ try } else //udp { - Socket sock(InterNetwork, Datagram); + Socket sock(AF_INET, SOCK_DGRAM); ComboAddress dest(argv[1] + (*argv[1]=='@'), atoi(argv[2])); sock.sendTo(string((char*)&*packet.begin(), (char*)&*packet.end()), dest); diff --git a/pdns/toysdig.cc b/pdns/toysdig.cc index 9fe253b209..72fb86a0d3 100644 --- a/pdns/toysdig.cc +++ b/pdns/toysdig.cc @@ -35,7 +35,7 @@ try pw.addOpt(1200, 0, 0, opts); // 1200 bytes answer size pw.commit(); - Socket sock(InterNetwork, Datagram); + Socket sock(AF_INET, SOCK_DGRAM); ComboAddress dest(argv[1] + (*argv[1]=='@'), atoi(argv[2])); sock.sendTo(string((char*)&*packet.begin(), (char*)&*packet.end()), dest); diff --git a/pdns/tsig-tests.cc b/pdns/tsig-tests.cc index b52e603928..34d85d3146 100644 --- a/pdns/tsig-tests.cc +++ b/pdns/tsig-tests.cc @@ -54,7 +54,7 @@ try addTSIG(pw, &trc, keyname, key, "", false); - Socket sock(InterNetwork, Datagram); + Socket sock(AF_INET, SOCK_DGRAM); ComboAddress dest(argv[1] + (*argv[1]=='@'), atoi(argv[2])); #if 0 sock.sendTo(string((char*)&*packet.begin(), (char*)&*packet.end()), dest); -- 2.47.2