diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc
index 25463571f..9a6c77368 100644
--- a/libnetutil/netutil.cc
+++ b/libnetutil/netutil.cc
@@ -3398,7 +3398,8 @@ int send_ip_packet_eth(const struct eth_nfo *eth, const u8 *packet, unsigned int
 
 
 /* Send an IP packet over a raw socket. */
-int send_ip_packet_sd(int sd, const u8 *packet, unsigned int packetlen) {
+int send_ip_packet_sd(int sd, const struct sockaddr_in *dst,
+  const u8 *packet, unsigned int packetlen) {
   struct sockaddr_in sock;
   struct ip *ip = (struct ip *) packet;
   struct tcp_hdr *tcp;
@@ -3406,16 +3407,11 @@ int send_ip_packet_sd(int sd, const u8 *packet, unsigned int packetlen) {
   int res;
 
   assert(sd >= 0);
-  memset(&sock, 0, sizeof(sock));
-  sock.sin_family = AF_INET;
-#if HAVE_SOCKADDR_SA_LEN
-  sock.sin_len = sizeof(sock);
-#endif
+  sock = *dst;
 
   /* It is bogus that I need the address and port info when sending a RAW IP 
      packet, but it doesn't seem to work w/o them */
   if (packetlen >= 20) {
-    sock.sin_addr.s_addr = ip->ip_dst.s_addr;
     if (ip->ip_p == IPPROTO_TCP
         && packetlen >= (unsigned int) ip->ip_hl * 4 + 20) {
       tcp = (struct tcp_hdr *) ((u8 *) ip + ip->ip_hl * 4);
@@ -3455,12 +3451,13 @@ int send_ip_packet_sd(int sd, const u8 *packet, unsigned int packetlen) {
 /* Sends the supplied pre-built IPv4 packet. The packet is sent through
  * the raw socket "sd" if "eth" is NULL. Otherwise, it gets sent at raw
  * ethernet level. */
-int send_ip_packet_eth_or_sd(int sd, const struct eth_nfo *eth, const u8 *packet,
-  unsigned int packetlen) {
+int send_ip_packet_eth_or_sd(int sd, const struct eth_nfo *eth,
+  const struct sockaddr_in *dst,
+  const u8 *packet, unsigned int packetlen) {
   if(eth)
     return send_ip_packet_eth(eth, packet, packetlen);
   else
-    return send_ip_packet_sd(sd, packet, packetlen);
+    return send_ip_packet_sd(sd, dst, packet, packetlen);
 }
 
 
@@ -3469,8 +3466,9 @@ int send_ip_packet_eth_or_sd(int sd, const struct eth_nfo *eth, const u8 *packet
  * Minimal MTU for IPv4 is 68 and maximal IPv4 header size is 60
  * which gives us a right to cut TCP header after 8th byte
  * (shouldn't we inflate the header to 60 bytes too?) */
-int send_frag_ip_packet(int sd, const struct eth_nfo *eth, const u8 *packet,
-                        unsigned int packetlen, u32 mtu) {
+int send_frag_ip_packet(int sd, const struct eth_nfo *eth,
+  const struct sockaddr_in *dst,
+  const u8 *packet, unsigned int packetlen, u32 mtu) {
   struct ip *ip = (struct ip *) packet;
   int headerlen = ip->ip_hl * 4; // better than sizeof(struct ip)
   u32 datalen = packetlen - headerlen;
@@ -3483,7 +3481,7 @@ int send_frag_ip_packet(int sd, const struct eth_nfo *eth, const u8 *packet,
 
   if (datalen <= mtu) {
     netutil_error("Warning: fragmentation (mtu=%lu) requested but the payload is too small already (%lu)", (unsigned long)mtu, (unsigned long)datalen);
-    return send_ip_packet_eth_or_sd(sd, eth, packet, packetlen);
+    return send_ip_packet_eth_or_sd(sd, eth, dst, packet, packetlen);
   }
 
   u8 *fpacket = (u8 *) safe_malloc(headerlen + mtu);
@@ -3504,7 +3502,7 @@ int send_frag_ip_packet(int sd, const struct eth_nfo *eth, const u8 *packet,
     if (fragment > 1) // copy data payload
       memcpy(fpacket + headerlen,
              packet + headerlen + (fragment - 1) * mtu, fdatalen);
-    res = send_ip_packet_eth_or_sd(sd, eth, fpacket, ntohs(ip->ip_len));
+    res = send_ip_packet_eth_or_sd(sd, eth, dst, fpacket, ntohs(ip->ip_len));
     if (res == -1)
       break;
   }
@@ -3558,29 +3556,20 @@ static int send_ipv6_eth(const struct eth_nfo *eth, const u8 *packet, unsigned i
 
 /* Send an IPv6 packet over a raw socket, on platforms where IPPROTO_RAW implies
    IP_HDRINCL-like behavior. */
-static int send_ipv6_ipproto_raw(const unsigned char *packet, unsigned int packetlen) {
-  struct ip6_hdr *hdr;
-  struct sockaddr_in6 dest = { 0 };
+static int send_ipv6_ipproto_raw(const struct sockaddr_in6 *dst,
+  const unsigned char *packet, unsigned int packetlen) {
   int sd, n;
 
   sd = -1;
   n = -1;
 
-  if (packetlen < sizeof(*hdr))
-    return -1;
-
-  hdr = (struct ip6_hdr *) packet;
-  dest.sin6_family = AF_INET6;
-  memcpy(&dest.sin6_addr.s6_addr, &hdr->ip6_dst, sizeof(dest.sin6_addr.s6_addr));
-  dest.sin6_port = 0;
-
   sd = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW);
   if (sd == -1) {
     perror("socket");
     goto bail;
   }
 
-  n = Sendto(__func__, sd, packet, packetlen, 0, (struct sockaddr *) &dest, sizeof(dest));
+  n = Sendto(__func__, sd, packet, packetlen, 0, (struct sockaddr *) dst, sizeof(*dst));
 
 bail:
   if (sd != -1)
@@ -3669,9 +3658,9 @@ static const unsigned char *add_exthdr_ancillary(struct msghdr *msg,
    with EPROTOTYPE because there are specialized functions to add these headers
    using the IPv6 socket API. These do not offer as much control because they
    are controlled by the OS, and may be reordered, for example. */
-static int send_ipv6_ip(const unsigned char *packet, size_t packetlen) {
+static int send_ipv6_ip(const struct sockaddr_in6 *dst,
+  const unsigned char *packet, size_t packetlen) {
   struct msghdr msg;
-  struct sockaddr_in6 dest = { 0 };
   struct iovec iov;
 
   const unsigned char *end;
@@ -3685,9 +3674,9 @@ static int send_ipv6_ip(const unsigned char *packet, size_t packetlen) {
   sd = -1;
   n = -1;
 
-  /* Set up sendmsg data structure. dest and iov are filled in below. */
-  msg.msg_name = &dest;
-  msg.msg_namelen = sizeof(dest);
+  /* Set up sendmsg data structure. iov is filled in below. */
+  msg.msg_name = (void *) dst;
+  msg.msg_namelen = sizeof(*dst);
   msg.msg_iov = &iov;
   msg.msg_iovlen = 1;
   msg.msg_control = NULL;
@@ -3698,10 +3687,6 @@ static int send_ipv6_ip(const unsigned char *packet, size_t packetlen) {
     return -1;
   hdr = (struct ip6_hdr *) packet;
 
-  dest.sin6_family = AF_INET6;
-  memcpy(&dest.sin6_addr.s6_addr, &hdr->ip6_dst, sizeof(dest.sin6_addr.s6_addr));
-  dest.sin6_port = 0;
-
   /* This can also be set with setsockopt(IPPROTO_IPV6, IPV6_TCLASS). */
 #ifdef IPV6_TCLASS
   tclass = ntohl(hdr->ip6_flow & IP6_FLOWINFO_MASK) >> 20;
@@ -3770,14 +3755,15 @@ bail:
 #endif
 
 /* For now, the sd argument is ignored. */
-int send_ipv6_packet_eth_or_sd(int sd, const struct eth_nfo *eth, const u8 *packet, unsigned int packetlen) {
+int send_ipv6_packet_eth_or_sd(int sd, const struct eth_nfo *eth,
+  const struct sockaddr_in6 *dst, const u8 *packet, unsigned int packetlen) {
   if (eth != NULL) {
     return send_ipv6_eth(eth, packet, packetlen);
   } else {
 #if HAVE_IPV6_IPPROTO_RAW
-    return send_ipv6_ipproto_raw(packet, packetlen);
+    return send_ipv6_ipproto_raw(dst, packet, packetlen);
 #elif !WIN32
-    return send_ipv6_ip(packet, packetlen);
+    return send_ipv6_ip(dst, packet, packetlen);
 #endif
   }
 
diff --git a/libnetutil/netutil.h b/libnetutil/netutil.h
index 1ed45c40d..c1b32e48a 100644
--- a/libnetutil/netutil.h
+++ b/libnetutil/netutil.h
@@ -435,7 +435,7 @@ int route_dst(const struct sockaddr_storage * const dst, struct route_nfo *rnfo,
               const char *device, const struct sockaddr_storage *spoofss);
 
 /* Send an IP packet over a raw socket. */
-int send_ip_packet_sd(int sd, const u8 *packet, unsigned int packetlen);
+int send_ip_packet_sd(int sd, const struct sockaddr_in *dst, const u8 *packet, unsigned int packetlen);
 
 /* Send an IP packet over an ethernet handle. */
 int send_ip_packet_eth(const struct eth_nfo *eth, const u8 *packet, unsigned int packetlen);
@@ -443,16 +443,19 @@ int send_ip_packet_eth(const struct eth_nfo *eth, const u8 *packet, unsigned int
 /* Sends the supplied pre-built IPv4 packet. The packet is sent through
  * the raw socket "sd" if "eth" is NULL. Otherwise, it gets sent at raw
  * ethernet level. */
-int send_ip_packet_eth_or_sd(int sd, const struct eth_nfo *eth, const u8 *packet, unsigned int packetlen);
+int send_ip_packet_eth_or_sd(int sd, const struct eth_nfo *eth,
+  const struct sockaddr_in *dst, const u8 *packet, unsigned int packetlen);
 
 /* Sends an IPv4 packet. */
-int send_ipv6_packet_eth_or_sd(int sd, const struct eth_nfo *eth, const u8 *packet, unsigned int len);
+int send_ipv6_packet_eth_or_sd(int sd, const struct eth_nfo *eth,
+  const struct sockaddr_in6 *dst, const u8 *packet, unsigned int packetlen);
 
 /* Create and send all fragments of a pre-built IPv4 packet.
  * Minimal MTU for IPv4 is 68 and maximal IPv4 header size is 60
  * which gives us a right to cut TCP header after 8th byte */
-int send_frag_ip_packet(int sd, const struct eth_nfo *eth, const u8 *packet,
-                        unsigned int packetlen, u32 mtu);
+int send_frag_ip_packet(int sd, const struct eth_nfo *eth,
+  const struct sockaddr_in *dst,
+  const u8 *packet, unsigned int packetlen, u32 mtu);
 
 /* Wrapper for system function sendto(), which retries a few times when
  * the call fails. It also prints informational messages about the
diff --git a/nse_dnet.cc b/nse_dnet.cc
index 9ace26aa2..5b4ebfe56 100644
--- a/nse_dnet.cc
+++ b/nse_dnet.cc
@@ -219,6 +219,10 @@ static int ip_send (lua_State *L)
   const char *packet = luaL_checkstring(L, 2);
   char dev[16];
   int ret;
+  struct sockaddr_storage srcss, dstss, *nexthop;
+  struct sockaddr_in *srcsin = (struct sockaddr_in *) &srcss;
+  struct sockaddr_in *dstsin = (struct sockaddr_in *) &dstss;
+  struct ip *ip = (struct ip *) packet;
 
   if (udata->sock == -1)
     return luaL_error(L, "raw socket not open to send");
@@ -228,21 +232,17 @@ static int ip_send (lua_State *L)
 
   *dev = '\0';
 
+  /* build sockaddr for target from user packet and determine route */
+  memset(&dstss, 0, sizeof(dstss));
+  dstsin->sin_family = AF_INET;
+  dstsin->sin_addr.s_addr = ip->ip_dst.s_addr;
+
   if (o.sendpref & PACKET_SEND_ETH)
   {
     struct route_nfo route;
-    struct sockaddr_storage srcss, dstss, *nexthop;
-    struct sockaddr_in *srcsin = (struct sockaddr_in *) &srcss;
-    struct sockaddr_in *dstsin = (struct sockaddr_in *) &dstss;
-    struct ip *ip = (struct ip *) packet;
     u8 dstmac[6];
     eth_nfo eth;
 
-    /* build sockaddr for target from user packet and determine route */
-    memset(&dstss, 0, sizeof(dstss));
-    dstsin->sin_family = AF_INET;
-    dstsin->sin_addr.s_addr = ip->ip_dst.s_addr;
-
     if (!nmap_route_dst(&dstss, &route))
       goto usesock;
 
@@ -283,14 +283,14 @@ static int ip_send (lua_State *L)
 
     udata->eth = eth.ethsd = open_eth_cached(L, 1, route.ii.devname);
 
-    ret = send_ip_packet(udata->sock, &eth, (u8 *) packet, lua_objlen(L, 2));
+    ret = send_ip_packet(udata->sock, &eth, &dstss, (u8 *) packet, lua_objlen(L, 2));
   } else {
 usesock:
 #ifdef WIN32
     if (strlen(dev) > 0)
       win32_fatal_raw_sockets(dev);
 #endif
-    ret = send_ip_packet(udata->sock, NULL, (u8 *) packet, lua_objlen(L, 2));
+    ret = send_ip_packet(udata->sock, NULL, &dstss, (u8 *) packet, lua_objlen(L, 2));
   }
   if (ret == -1)
     return safe_error(L, "error while sending: %s (errno %d)",
diff --git a/osscan2.cc b/osscan2.cc
index b2fb5e789..5c2917444 100644
--- a/osscan2.cc
+++ b/osscan2.cc
@@ -2121,7 +2121,7 @@ int HostOsScan::send_icmp_echo_probe(HostOsScanStats *hss,
                             o.ttl, get_random_u16(), tos, df, NULL, 0, seq, id,
                             ICMP_ECHO, pcode, NULL, datalen, &packetlen);
     if(!packet) return -1;
-    res = send_ip_packet(rawsd, ethptr, packet, packetlen);
+    res = send_ip_packet(rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
     free(packet);
     if(res==-1) return -1;
   }
@@ -2213,7 +2213,7 @@ int HostOsScan::send_closedudp_probe(HostOsScanStats *hss,
       hss->upi.target.s_addr = ip->ip_dst.s_addr;
     }
 
-    if ((res = send_ip_packet(rawsd, ethptr, packet, ntohs(ip->ip_len))) == -1)
+    if ((res = send_ip_packet(rawsd, ethptr, hss->target->TargetSockAddr(), packet, ntohs(ip->ip_len))) == -1)
       {
         gh_perror("send_ip_packet in %s", __func__);
         return 1;
diff --git a/scan_engine.cc b/scan_engine.cc
index 6264841e9..4655e984f 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -3233,7 +3233,7 @@ static UltraProbe *sendNDScanProbe(UltraScanInfo *USI, HostScanStats *hss,
                 &packetlen);
   probe->sent = USI->now;
   hss->probeSent(packetlen);
-  send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+  send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
 
   probe->tryno = tryno;
   probe->pingseq = pingseq;
@@ -3442,7 +3442,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
           probe->sent = USI->now;
         }
         hss->probeSent(packetlen);
-        send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+        send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
         free(packet);
       }
     } else if (hss->target->af() == AF_INET6) {
@@ -3462,7 +3462,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
       probe->setIP(packet, packetlen, pspec);
       probe->sent = USI->now;
       hss->probeSent(packetlen);
-      send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+      send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
       free(packet);
     }
   } else if (pspec->type == PS_UDP) {
@@ -3484,7 +3484,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
           probe->sent = USI->now;
         }
         hss->probeSent(packetlen);
-        send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+        send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
         free(packet);
       }
     } else if (hss->target->af() == AF_INET6) {
@@ -3502,7 +3502,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
       probe->setIP(packet, packetlen, pspec);
       probe->sent = USI->now;
       hss->probeSent(packetlen);
-      send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+      send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
       free(packet);
     }
   } else if (pspec->type == PS_SCTP) {
@@ -3541,7 +3541,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
           probe->sent = USI->now;
         }
         hss->probeSent(packetlen);
-        send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+        send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
         free(packet);
       }
     } else if (hss->target->af() == AF_INET6) {
@@ -3560,7 +3560,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
       probe->setIP(packet, packetlen, pspec);
       probe->sent = USI->now;
       hss->probeSent(packetlen);
-      send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+      send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
       free(packet);
     }
     free(chunk);
@@ -3582,7 +3582,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
           probe->sent = USI->now;
         }
         hss->probeSent(packetlen);
-        send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+        send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
         free(packet);
       }
     } else if (hss->target->af() == AF_INET6) {
@@ -3592,7 +3592,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
       probe->setIP(packet, packetlen, pspec);
       probe->sent = USI->now;
       hss->probeSent(packetlen);
-      send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+      send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
       free(packet);
     }
   } else if (pspec->type == PS_ICMP) {
@@ -3608,7 +3608,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
 	probe->sent = USI->now;
       }
       hss->probeSent(packetlen);
-      send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+      send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
       free(packet);
     }
   } else if (pspec->type == PS_ICMPV6) {
@@ -3627,7 +3627,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
     probe->setIP(packet, packetlen, pspec);
     probe->sent = USI->now;
     hss->probeSent(packetlen);
-    send_ip_packet(USI->rawsd, ethptr, packet, packetlen);
+    send_ip_packet(USI->rawsd, ethptr, hss->target->TargetSockAddr(), packet, packetlen);
     free(packet);
   }else assert(0); /* TODO:  Maybe RPC scan and the like */
 
diff --git a/tcpip.cc b/tcpip.cc
index 2b402e271..4359c4886 100644
--- a/tcpip.cc
+++ b/tcpip.cc
@@ -453,8 +453,9 @@ struct addrinfo *resolve_all(char *hostname, int pf)
 
 /* Send a pre-built IPv4 packet. Handles fragmentation and whether to send with
    an ethernet handle or a socket. */
-static int send_ipv4_packet(int sd, const struct eth_nfo *eth, const u8 *packet,
-                   unsigned int packetlen) {
+static int send_ipv4_packet(int sd, const struct eth_nfo *eth,
+  const struct sockaddr_in *dst,
+  const u8 *packet, unsigned int packetlen) {
   struct ip *ip = (struct ip *) packet;
   int res;
 
@@ -464,9 +465,9 @@ static int send_ipv4_packet(int sd, const struct eth_nfo *eth, const u8 *packet,
   /* Fragmentation requested && packet is bigger than MTU */
   if(o.fragscan && !(ntohs(ip->ip_off) & IP_DF) &&
      (packetlen - ip->ip_hl * 4 > (unsigned int) o.fragscan)){
-    res = send_frag_ip_packet(sd, eth, packet, packetlen, o.fragscan);
+    res = send_frag_ip_packet(sd, eth, dst, packet, packetlen, o.fragscan);
   }else{
-    res = send_ip_packet_eth_or_sd(sd, eth, packet, packetlen);
+    res = send_ip_packet_eth_or_sd(sd, eth, dst, packet, packetlen);
   }
   if (res != -1)
     PacketTrace::trace(PacketTrace::SENT, packet, packetlen);
@@ -474,29 +475,34 @@ static int send_ipv4_packet(int sd, const struct eth_nfo *eth, const u8 *packet,
   return res;
 }
 
-static int send_ipv6_packet(int sd, const struct eth_nfo *eth, const u8 *packet,
-  unsigned int packetlen){
+static int send_ipv6_packet(int sd, const struct eth_nfo *eth,
+  const struct sockaddr_in6 *dst,
+  const u8 *packet, unsigned int packetlen){
   int res;
 
-  res = send_ipv6_packet_eth_or_sd(sd, eth, packet, packetlen);
+  res = send_ipv6_packet_eth_or_sd(sd, eth, dst, packet, packetlen);
   if (res != -1)
     PacketTrace::trace(PacketTrace::SENT, packet, packetlen);
 
   return res;
 }
 
-int send_ip_packet(int sd, const struct eth_nfo *eth, const u8 *packet,
-  unsigned int packetlen) {
+int send_ip_packet(int sd, const struct eth_nfo *eth,
+  const struct sockaddr_storage *dst,
+  const u8 *packet, unsigned int packetlen) {
   struct ip *ip = (struct ip *) packet;
 
   /* Ensure there's enough to read ip->ip_v at least. */
   if (packetlen < 1)
     return -1;
 
-  if (ip->ip_v == 4)
-    return send_ipv4_packet(sd, eth, packet, packetlen);
-  else if (ip->ip_v == 6)
-    return send_ipv6_packet(sd, eth, packet, packetlen);
+  if (ip->ip_v == 4) {
+    assert(dst->ss_family == AF_INET);
+    return send_ipv4_packet(sd, eth, (struct sockaddr_in *) dst, packet, packetlen);
+  } else if (ip->ip_v == 6) {
+    assert(dst->ss_family == AF_INET6);
+    return send_ipv6_packet(sd, eth, (struct sockaddr_in6 *) dst, packet, packetlen);
+  }
 
   fatal("%s only understands IP versions 4 and 6 (got %u)", __func__, ip->ip_v);
 
@@ -758,6 +764,8 @@ int send_tcp_raw(int sd, const struct eth_nfo *eth,
                  u8 *ipops, int ipoptlen, u16 sport, u16 dport, u32 seq,
                  u32 ack, u8 reserved, u8 flags, u16 window, u16 urp,
                  u8 *options, int optlen, char *data, u16 datalen) {
+  struct sockaddr_storage dst;
+  struct sockaddr_in *dst_in;
   unsigned int packetlen;
   int res = -1;
 
@@ -770,7 +778,11 @@ int send_tcp_raw(int sd, const struct eth_nfo *eth,
                              data, datalen, &packetlen);
   if (!packet)
     return -1;
-  res = send_ip_packet(sd, eth, packet, packetlen);
+  memset(&dst, 0, sizeof(dst));
+  dst_in = (struct sockaddr_in *) &dst;
+  dst_in->sin_family = AF_INET;
+  dst_in->sin_addr = *victim;
+  res = send_ip_packet(sd, eth, &dst, packet, packetlen);
 
   free(packet);
   return res;
@@ -876,6 +888,8 @@ int send_udp_raw(int sd, const struct eth_nfo *eth,
                  int ttl, u16 ipid,
                  u8 *ipopt, int ipoptlen,
                  u16 sport, u16 dport, char *data, u16 datalen) {
+  struct sockaddr_storage dst;
+  struct sockaddr_in *dst_in;
   unsigned int packetlen;
   int res = -1;
   u8 *packet = build_udp_raw(source, victim,
@@ -885,7 +899,11 @@ int send_udp_raw(int sd, const struct eth_nfo *eth,
                              data, datalen, &packetlen);
   if (!packet)
     return -1;
-  res = send_ip_packet(sd, eth, packet, packetlen);
+  memset(&dst, 0, sizeof(dst));
+  dst_in = (struct sockaddr_in *) &dst;
+  dst_in->sin_family = AF_INET;
+  dst_in->sin_addr = *victim;
+  res = send_ip_packet(sd, eth, &dst, packet, packetlen);
 
   free(packet);
   return res;
diff --git a/tcpip.h b/tcpip.h
index 5c638ff50..2482a274f 100644
--- a/tcpip.h
+++ b/tcpip.h
@@ -421,8 +421,9 @@ unsigned short in_cksum(u16 *ptr,int nbytes);
 
 
 /* Send a pre-built IPv4 or IPv6 packet */
-int send_ip_packet(int sd, const struct eth_nfo *eth, const u8 *packet, 
-		   unsigned int packetlen);
+int send_ip_packet(int sd, const struct eth_nfo *eth,
+  const struct sockaddr_storage *dst,
+  const u8 *packet, unsigned int packetlen);
 
 /* Builds an IP packet (including an IP header) by packing the fields
    with the given information.  It allocates a new buffer to store the
diff --git a/traceroute.cc b/traceroute.cc
index dec5353af..371eb5860 100644
--- a/traceroute.cc
+++ b/traceroute.cc
@@ -641,7 +641,7 @@ void Probe::send(int rawsd, eth_t *ethsd, struct timeval *now) {
     }
 
     packet = this->build_packet(&source, &packetlen);
-    send_ip_packet(rawsd, ethp, packet, packetlen);
+    send_ip_packet(rawsd, ethp, host->target->TargetSockAddr(), packet, packetlen);
     free(packet);
   }
 }