diff --git a/gtests/net/packetdrill/run_packet.c b/gtests/net/packetdrill/run_packet.c
index a1ee8b032639e594c07514199e4e6f6d5555938d..305acbb1a53dc5f33b98054bf2f528433d0d5b76 100644
--- a/gtests/net/packetdrill/run_packet.c
+++ b/gtests/net/packetdrill/run_packet.c
@@ -215,7 +215,7 @@ static inline bool sctp_is_init_packet(const struct packet *packet) {
if (packet->chunk_list != NULL) {
item = packet->chunk_list->first;
if ((item != NULL) &&
- (item->chunk->type == SCTP_INIT_CHUNK_TYPE)) {
+ (item->chunk->type == SCTP_INIT_CHUNK_TYPE)) {
return true;
}
} else {
@@ -287,11 +287,10 @@ static struct socket *handle_listen_for_script_packet(
struct sctp_init_chunk *init;
item = packet->chunk_list->first;
init = (struct sctp_init_chunk *) item->chunk;
-
+
sctp_socket_set_initiate_tag(socket, ntohl(init->initiate_tag));
sctp_socket_set_initial_tsn(socket, ntohl(init->initial_tsn));
- }
- else {
+ } else {
struct header sctp_header;
unsigned int i;
bool found = false;
@@ -3277,15 +3276,14 @@ static int do_inbound_script_packet(
socket->last_injected_tcp_payload_len =
packet_payload_len(live_packet);
}
-
- if ((state->socket_under_test == NULL) &&
- (((live_packet->ipv4 != NULL) &&
- (live_packet->ipv4->src_ip.s_addr == htonl(INADDR_ANY))) ||
- ((live_packet->ipv6 != NULL) &&
- (IN6_IS_ADDR_UNSPECIFIED(&live_packet->ipv6->src_ip))))) {
+ if (((live_packet->ipv4 != NULL) &&
+ (live_packet->ipv4->src_ip.s_addr == htonl(INADDR_ANY))) ||
+ ((live_packet->ipv6 != NULL) &&
+ (IN6_IS_ADDR_UNSPECIFIED(&live_packet->ipv6->src_ip)))) {
struct tuple live_inbound;
- DEBUGP("live_packet has wildcard source address\n");
+ DEBUGP("live_packet has wildcard source address.\n");
+ DEBUGP("socket_under_test = %p\n", state->socket_under_test);
state->socket_under_test = setup_new_child_socket(state, packet);
socket_get_inbound(&state->socket_under_test->live, &live_inbound);
set_packet_tuple(live_packet, &live_inbound);
diff --git a/gtests/net/packetdrill/symbols_freebsd.c b/gtests/net/packetdrill/symbols_freebsd.c
index ba18cd43ebabeab50845dc3e7d4a40449f1daad4..c919906083a06f91fe32bc93b8128d6a07ccf23e 100644
--- a/gtests/net/packetdrill/symbols_freebsd.c
+++ b/gtests/net/packetdrill/symbols_freebsd.c
@@ -78,6 +78,78 @@ struct int_symbol platform_symbols_table[] = {
{ SO_SETFIB, "SO_SETFIB" },
{ SO_USER_COOKIE, "SO_USER_COOKIE" },
+ /* /usr/include/netinet/in.h */
+ { IP_OPTIONS, "IP_OPTIONS" },
+ { IP_HDRINCL, "IP_HDRINCL" },
+ { IP_TOS, "IP_TOS" },
+ { IP_TTL, "IP_TTL" },
+ { IP_RECVOPTS, "IP_RECVOPTS" },
+ { IP_RECVRETOPTS, "IP_RECVRETOPTS" },
+ { IP_RECVDSTADDR, "IP_RECVDSTADDR" },
+ { IP_SENDSRCADDR, "IP_SENDSRCADDR" },
+ { IP_RETOPTS, "IP_RETOPTS" },
+ { IP_PORTRANGE, "IP_PORTRANGE" },
+ { IP_RECVIF, "IP_RECVIF" },
+#ifdef IP_RSS_LISTEN_BUCKET
+ { IP_RSS_LISTEN_BUCKET, "IP_RSS_LISTEN_BUCKET" },
+#endif
+ { IP_RECVTTL, "IP_RECVTTL" },
+ { IP_MINTTL, "IP_MINTTL," },
+ { IP_DONTFRAG, "IP_DONTFRAG" },
+ { IP_RECVTOS, "IP_RECVTOS" },
+#ifdef IP_FLOWID
+ { IP_FLOWID, "IP_FLOWID" },
+#endif
+#ifdef IP_FLOWTYPE
+ { IP_FLOWTYPE, "IP_FLOWTYPE" },
+#endif
+#ifdef IP_RSSBUCKETID
+ { IP_RSSBUCKETID, "IP_RSSBUCKETID" },
+#endif
+#ifdef IP_RECVFLOWID
+ { IP_RECVFLOWID, "IP_RECVFLOWID" },
+#endif
+#ifdef IP_RECVRSSBUCKETID
+ { IP_RECVRSSBUCKETID, "IP_RECVRSSBUCKETID" },
+#endif
+
+ /* /usr/include/netinet6/in6.h */
+ { IPV6_UNICAST_HOPS, "IPV6_UNICAST_HOPS" },
+ { IPV6_PORTRANGE, "IPV6_PORTRANGE" },
+ { IPV6_CHECKSUM, "IPV6_CHECKSUM" },
+ { IPV6_V6ONLY, "IPV6_V6ONLY" },
+ { IPV6_RECVPKTINFO, "IPV6_RECVPKTINFO" },
+ { IPV6_RECVHOPLIMIT, "IPV6_RECVHOPLIMIT" },
+ { IPV6_RECVRTHDR, "IPV6_RECVRTHDR" },
+ { IPV6_RECVHOPOPTS, "IPV6_RECVHOPOPTS" },
+ { IPV6_RECVDSTOPTS, "IPV6_RECVDSTOPTS" },
+ { IPV6_USE_MIN_MTU, "IPV6_USE_MIN_MTU" },
+ { IPV6_RECVPATHMTU, "IPV6_RECVPATHMTU" },
+ { IPV6_PATHMTU, "IPV6_PATHMTU" },
+ { IPV6_HOPLIMIT, "IPV6_HOPLIMIT" },
+ { IPV6_RECVTCLASS, "IPV6_RECVTCLASS" },
+ { IPV6_AUTOFLOWLABEL, "IPV6_AUTOFLOWLABEL" },
+ { IPV6_TCLASS, "IPV6_TCLASS" },
+ { IPV6_DONTFRAG, "IPV6_DONTFRAG" },
+#ifdef IPV6_RSS_LISTEN_BUCKET
+ { IPV6_RSS_LISTEN_BUCKET, "IPV6_RSS_LISTEN_BUCKET" },
+#endif
+#ifdef IPV6_FLOWID
+ { IPV6_FLOWID, "IPV6_FLOWID" },
+#endif
+#ifdef IPV6_FLOWTYPE
+ { IPV6_FLOWTYPE, "IPV6_FLOWTYPE" },
+#endif
+#ifdef IPV6_RSSBUCKETID
+ { IPV6_RSSBUCKETID, "IPV6_RSSBUCKETID" },
+#endif
+#ifdef IPV6_RECVFLOWID
+ { IPV6_RECVFLOWID, "IPV6_RECVFLOWID" },
+#endif
+#ifdef IPV6_RECVRSSBUCKETID
+ { IPV6_RECVRSSBUCKETID, "IPV6_RECVRSSBUCKETID" },
+#endif
+
/* /usr/include/netinet/sctp.h and /usr/include/netinet/sctp_uio.h */
{ SCTP_RTOINFO, "SCTP_RTOINFO" },
{ SCTP_ASSOCINFO, "SCTP_ASSOCINFO" },