Merge branch 'master' of github.com:nplab/packetdrill

README.md

@@ -24,7 +24,7 @@ sudo cp packetdrill /usr/bin
 ### Linux (Ubuntu)
 For installing the required packages run:
 ```
-sudo apt-get install make git libsctp-dev bison flex
+sudo apt-get install make git libsctp-dev bison flex python
 ```
 Then download the sources, compile them and install the binary:
 ```
@@ -37,7 +37,7 @@ sudo cp packetdrill /usr/bin
 ### FreeBSD
 For installing the required packages run:
 ```
-sudo pkg install git bison
+sudo pkg install git bison python
 ```
 Then download the sources, compile them and install the binary:
 ```

gtests/net/packetdrill/tests/linux/sctp/api_tests/cmsgs/sendmsg_sctp_init.pkt

@@ -8,7 +8,7 @@
 
 +0.0 sendmsg(3, {msg_name(...)=...,
 		 msg_iov(1)=[{iov_base=..., iov_len=1000}],
-		 msg_control(20)=[{cmsg_len=20,
+		 msg_control(24)=[{cmsg_len=24,
 				   cmsg_level=IPPROTO_SCTP,
 				   cmsg_type=SCTP_INIT,
 				   cmsg_data={sinit_num_ostreams=1,

gtests/net/packetdrill/tests/linux/sctp/api_tests/cmsgs/sendmsg_sctp_sndrcv.pkt

@@ -25,7 +25,7 @@
 							 spp_dscp=0}, 152) = 0
 +0.0 sendmsg(3, {msg_name(...)=...,
 		 msg_iov(1)=[{iov_base=..., iov_len=1000}],
-		 msg_control(44)=[{cmsg_len=44,
+		 msg_control(48)=[{cmsg_len=48,
 				    cmsg_level=IPPROTO_SCTP,
 				    cmsg_type=SCTP_SNDRCV,
 				    cmsg_data={sinfo_stream=3,
@@ -44,7 +44,7 @@
 //test for sndrcvinfo
 +0.0 sendmsg(3, {msg_name(...)=...,
 		 msg_iov(1)=[{iov_base=..., iov_len=1000}],
-		 msg_control(44)=[{cmsg_len=44,
+		 msg_control(48)=[{cmsg_len=48,
 				    cmsg_level=IPPROTO_SCTP,
 				    cmsg_type=SCTP_SNDRCV,
 				    cmsg_data={sinfo_stream=3,
@@ -62,7 +62,7 @@
 
 +0.0 sendmsg(3, {msg_name(...)=...,
 		 msg_iov(1)=[{iov_base=..., iov_len=1000}],
-		 msg_control(44)=[{cmsg_len=44,
+		 msg_control(48)=[{cmsg_len=48,
 				    cmsg_level=IPPROTO_SCTP,
 				    cmsg_type=SCTP_SNDRCV,
 				    cmsg_data={sinfo_stream=3,
@@ -80,7 +80,7 @@
 
 +0.0 sendmsg(3, {msg_name(...)=...,
 		 msg_iov(1)=[{iov_base=..., iov_len=1000}],
-		 msg_control(44)=[{cmsg_len=44,
+		 msg_control(48)=[{cmsg_len=48,
 				    cmsg_level=IPPROTO_SCTP,
 				    cmsg_type=SCTP_SNDRCV,
 				    cmsg_data={sinfo_stream=3,

gtests/net/packetdrill/tests/linux/sctp/api_tests/getsockopt/sctp_primary_addr.pkt

@@ -13,19 +13,19 @@
 +0 setsockopt(3, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, {ssp_assoc_id=...,
 						   ssp_addr={sa_family=AF_INET,
 							     sin_port=htons(8080),
-							     sin_addr=inet_addr("192.0.2.1")}}, 136) = 0
+							     sin_addr=inet_addr("192.0.2.1")}}, 132) = 0
 +0 getsockopt(3, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, {ssp_assoc_id=...,
 						   ssp_addr={sa_family=AF_INET,
 						   sin_port=htons(8080),
-						   sin_addr=inet_addr("192.0.2.1")}}, [136]) = 0
+						   sin_addr=inet_addr("192.0.2.1")}}, [132]) = 0
 +0 getsockopt(3, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, {ssp_assoc_id=...,
-						   ssp_addr=...}, [136]) = 0
+						   ssp_addr=...}, [132]) = 0
 
 +0 setsockopt(3, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, {ssp_addr={sa_family=AF_INET,
 							     sin_port=htons(8080),
-							     sin_addr=inet_addr("192.0.2.1")}}, 136) = 0
+							     sin_addr=inet_addr("192.0.2.1")}}, 132) = 0
 +0 getsockopt(3, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, {ssp_addr={sa_family=AF_INET,
 						   sin_port=htons(8080),
-						   sin_addr=inet_addr("192.0.2.1")}}, [136]) = 0
+						   sin_addr=inet_addr("192.0.2.1")}}, [132]) = 0
 
 +0 close(3) = 0