Merge pull request #234 from xairy/up-icmp-sockets

sys: use consistent icmp socket syscall names

1 files changed, 30 insertions, 36 deletions

diff --git a/executor/syscalls.h b/executor/syscalls.h
index 9662d7718..7901ad9e0 100644
--- a/executor/syscalls.h
+++ b/executor/syscalls.h
@@ -200,8 +200,6 @@ static call_t syscalls[] = {
     {"getsockopt$bt_rfcomm_RFCOMM_LM", 55},
     {"getsockopt$bt_sco_SCO_CONNINFO", 55},
     {"getsockopt$bt_sco_SCO_OPTIONS", 55},
-    {"getsockopt$icmp6_buf", 55},
-    {"getsockopt$icmp_buf", 55},
     {"getsockopt$inet6_IPV6_FLOWLABEL_MGR", 55},
     {"getsockopt$inet6_IPV6_IPSEC_POLICY", 55},
     {"getsockopt$inet6_IPV6_XFRM_POLICY", 55},
@@ -1137,8 +1135,6 @@ static call_t syscalls[] = {
     {"setsockopt$bt_l2cap_L2CAP_LM", 54},
     {"setsockopt$bt_l2cap_L2CAP_OPTIONS", 54},
     {"setsockopt$bt_rfcomm_RFCOMM_LM", 54},
-    {"setsockopt$icmp6_buf", 54},
-    {"setsockopt$icmp_buf", 54},
     {"setsockopt$inet6_IPV6_FLOWLABEL_MGR", 54},
     {"setsockopt$inet6_IPV6_IPSEC_POLICY", 54},
     {"setsockopt$inet6_IPV6_PKTINFO", 54},
@@ -1155,6 +1151,7 @@ static call_t syscalls[] = {
     {"setsockopt$inet6_dccp_buf", 54},
     {"setsockopt$inet6_dccp_int", 54},
     {"setsockopt$inet6_group_source_req", 54},
+    {"setsockopt$inet6_icmp_ICMP_FILTER", 54},
     {"setsockopt$inet6_int", 54},
     {"setsockopt$inet6_mreq", 54},
     {"setsockopt$inet6_mtu", 54},
@@ -1175,6 +1172,7 @@ static call_t syscalls[] = {
     {"setsockopt$inet_dccp_buf", 54},
     {"setsockopt$inet_dccp_int", 54},
     {"setsockopt$inet_group_source_req", 54},
+    {"setsockopt$inet_icmp_ICMP_FILTER", 54},
     {"setsockopt$inet_int", 54},
     {"setsockopt$inet_mreq", 54},
     {"setsockopt$inet_mreqn", 54},
@@ -1323,17 +1321,17 @@ static call_t syscalls[] = {
     {"socket$bt_l2cap", 41},
     {"socket$bt_rfcomm", 41},
     {"socket$bt_sco", 41},
-    {"socket$icmp", 41},
-    {"socket$icmp6", 41},
-    {"socket$icmp6_raw", 41},
-    {"socket$icmp_raw", 41},
     {"socket$inet", 41},
     {"socket$inet6", 41},
     {"socket$inet6_dccp", 41},
+    {"socket$inet6_icmp", 41},
+    {"socket$inet6_icmp_raw", 41},
     {"socket$inet6_sctp", 41},
     {"socket$inet6_tcp", 41},
     {"socket$inet6_udp", 41},
     {"socket$inet_dccp", 41},
+    {"socket$inet_icmp", 41},
+    {"socket$inet_icmp_raw", 41},
     {"socket$inet_sctp", 41},
     {"socket$inet_tcp", 41},
     {"socket$inet_udp", 41},
@@ -1347,17 +1345,17 @@ static call_t syscalls[] = {
     {"socket$unix", 41},
     {"socketpair", 53},
     {"socketpair$ax25", 53},
-    {"socketpair$icmp", 53},
-    {"socketpair$icmp6", 53},
-    {"socketpair$icmp6_raw", 53},
-    {"socketpair$icmp_raw", 53},
     {"socketpair$inet", 53},
     {"socketpair$inet6", 53},
     {"socketpair$inet6_dccp", 53},
+    {"socketpair$inet6_icmp", 53},
+    {"socketpair$inet6_icmp_raw", 53},
     {"socketpair$inet6_sctp", 53},
     {"socketpair$inet6_tcp", 53},
     {"socketpair$inet6_udp", 53},
     {"socketpair$inet_dccp", 53},
+    {"socketpair$inet_icmp", 53},
+    {"socketpair$inet_icmp_raw", 53},
     {"socketpair$inet_sctp", 53},
     {"socketpair$inet_tcp", 53},
     {"socketpair$inet_udp", 53},
@@ -1709,8 +1707,6 @@ static call_t syscalls[] = {
     {"getsockopt$bt_rfcomm_RFCOMM_LM", 209},
     {"getsockopt$bt_sco_SCO_CONNINFO", 209},
     {"getsockopt$bt_sco_SCO_OPTIONS", 209},
-    {"getsockopt$icmp6_buf", 209},
-    {"getsockopt$icmp_buf", 209},
     {"getsockopt$inet6_IPV6_FLOWLABEL_MGR", 209},
     {"getsockopt$inet6_IPV6_IPSEC_POLICY", 209},
     {"getsockopt$inet6_IPV6_XFRM_POLICY", 209},
@@ -2646,8 +2642,6 @@ static call_t syscalls[] = {
     {"setsockopt$bt_l2cap_L2CAP_LM", 208},
     {"setsockopt$bt_l2cap_L2CAP_OPTIONS", 208},
     {"setsockopt$bt_rfcomm_RFCOMM_LM", 208},
-    {"setsockopt$icmp6_buf", 208},
-    {"setsockopt$icmp_buf", 208},
     {"setsockopt$inet6_IPV6_FLOWLABEL_MGR", 208},
     {"setsockopt$inet6_IPV6_IPSEC_POLICY", 208},
     {"setsockopt$inet6_IPV6_PKTINFO", 208},
@@ -2664,6 +2658,7 @@ static call_t syscalls[] = {
     {"setsockopt$inet6_dccp_buf", 208},
     {"setsockopt$inet6_dccp_int", 208},
     {"setsockopt$inet6_group_source_req", 208},
+    {"setsockopt$inet6_icmp_ICMP_FILTER", 208},
     {"setsockopt$inet6_int", 208},
     {"setsockopt$inet6_mreq", 208},
     {"setsockopt$inet6_mtu", 208},
@@ -2684,6 +2679,7 @@ static call_t syscalls[] = {
     {"setsockopt$inet_dccp_buf", 208},
     {"setsockopt$inet_dccp_int", 208},
     {"setsockopt$inet_group_source_req", 208},
+    {"setsockopt$inet_icmp_ICMP_FILTER", 208},
     {"setsockopt$inet_int", 208},
     {"setsockopt$inet_mreq", 208},
     {"setsockopt$inet_mreqn", 208},
@@ -2832,17 +2828,17 @@ static call_t syscalls[] = {
     {"socket$bt_l2cap", 198},
     {"socket$bt_rfcomm", 198},
     {"socket$bt_sco", 198},
-    {"socket$icmp", 198},
-    {"socket$icmp6", 198},
-    {"socket$icmp6_raw", 198},
-    {"socket$icmp_raw", 198},
     {"socket$inet", 198},
     {"socket$inet6", 198},
     {"socket$inet6_dccp", 198},
+    {"socket$inet6_icmp", 198},
+    {"socket$inet6_icmp_raw", 198},
     {"socket$inet6_sctp", 198},
     {"socket$inet6_tcp", 198},
     {"socket$inet6_udp", 198},
     {"socket$inet_dccp", 198},
+    {"socket$inet_icmp", 198},
+    {"socket$inet_icmp_raw", 198},
     {"socket$inet_sctp", 198},
     {"socket$inet_tcp", 198},
     {"socket$inet_udp", 198},
@@ -2856,17 +2852,17 @@ static call_t syscalls[] = {
     {"socket$unix", 198},
     {"socketpair", 199},
     {"socketpair$ax25", 199},
-    {"socketpair$icmp", 199},
-    {"socketpair$icmp6", 199},
-    {"socketpair$icmp6_raw", 199},
-    {"socketpair$icmp_raw", 199},
     {"socketpair$inet", 199},
     {"socketpair$inet6", 199},
     {"socketpair$inet6_dccp", 199},
+    {"socketpair$inet6_icmp", 199},
+    {"socketpair$inet6_icmp_raw", 199},
     {"socketpair$inet6_sctp", 199},
     {"socketpair$inet6_tcp", 199},
     {"socketpair$inet6_udp", 199},
     {"socketpair$inet_dccp", 199},
+    {"socketpair$inet_icmp", 199},
+    {"socketpair$inet_icmp_raw", 199},
     {"socketpair$inet_sctp", 199},
     {"socketpair$inet_tcp", 199},
     {"socketpair$inet_udp", 199},
@@ -3218,8 +3214,6 @@ static call_t syscalls[] = {
     {"getsockopt$bt_rfcomm_RFCOMM_LM", 340},
     {"getsockopt$bt_sco_SCO_CONNINFO", 340},
     {"getsockopt$bt_sco_SCO_OPTIONS", 340},
-    {"getsockopt$icmp6_buf", 340},
-    {"getsockopt$icmp_buf", 340},
     {"getsockopt$inet6_IPV6_FLOWLABEL_MGR", 340},
     {"getsockopt$inet6_IPV6_IPSEC_POLICY", 340},
     {"getsockopt$inet6_IPV6_XFRM_POLICY", 340},
@@ -4155,8 +4149,6 @@ static call_t syscalls[] = {
     {"setsockopt$bt_l2cap_L2CAP_LM", 339},
     {"setsockopt$bt_l2cap_L2CAP_OPTIONS", 339},
     {"setsockopt$bt_rfcomm_RFCOMM_LM", 339},
-    {"setsockopt$icmp6_buf", 339},
-    {"setsockopt$icmp_buf", 339},
     {"setsockopt$inet6_IPV6_FLOWLABEL_MGR", 339},
     {"setsockopt$inet6_IPV6_IPSEC_POLICY", 339},
     {"setsockopt$inet6_IPV6_PKTINFO", 339},
@@ -4173,6 +4165,7 @@ static call_t syscalls[] = {
     {"setsockopt$inet6_dccp_buf", 339},
     {"setsockopt$inet6_dccp_int", 339},
     {"setsockopt$inet6_group_source_req", 339},
+    {"setsockopt$inet6_icmp_ICMP_FILTER", 339},
     {"setsockopt$inet6_int", 339},
     {"setsockopt$inet6_mreq", 339},
     {"setsockopt$inet6_mtu", 339},
@@ -4193,6 +4186,7 @@ static call_t syscalls[] = {
     {"setsockopt$inet_dccp_buf", 339},
     {"setsockopt$inet_dccp_int", 339},
     {"setsockopt$inet_group_source_req", 339},
+    {"setsockopt$inet_icmp_ICMP_FILTER", 339},
     {"setsockopt$inet_int", 339},
     {"setsockopt$inet_mreq", 339},
     {"setsockopt$inet_mreqn", 339},
@@ -4341,17 +4335,17 @@ static call_t syscalls[] = {
     {"socket$bt_l2cap", 326},
     {"socket$bt_rfcomm", 326},
     {"socket$bt_sco", 326},
-    {"socket$icmp", 326},
-    {"socket$icmp6", 326},
-    {"socket$icmp6_raw", 326},
-    {"socket$icmp_raw", 326},
     {"socket$inet", 326},
     {"socket$inet6", 326},
     {"socket$inet6_dccp", 326},
+    {"socket$inet6_icmp", 326},
+    {"socket$inet6_icmp_raw", 326},
     {"socket$inet6_sctp", 326},
     {"socket$inet6_tcp", 326},
     {"socket$inet6_udp", 326},
     {"socket$inet_dccp", 326},
+    {"socket$inet_icmp", 326},
+    {"socket$inet_icmp_raw", 326},
     {"socket$inet_sctp", 326},
     {"socket$inet_tcp", 326},
     {"socket$inet_udp", 326},
@@ -4365,17 +4359,17 @@ static call_t syscalls[] = {
     {"socket$unix", 326},
     {"socketpair", 333},
     {"socketpair$ax25", 333},
-    {"socketpair$icmp", 333},
-    {"socketpair$icmp6", 333},
-    {"socketpair$icmp6_raw", 333},
-    {"socketpair$icmp_raw", 333},
     {"socketpair$inet", 333},
     {"socketpair$inet6", 333},
     {"socketpair$inet6_dccp", 333},
+    {"socketpair$inet6_icmp", 333},
+    {"socketpair$inet6_icmp_raw", 333},
     {"socketpair$inet6_sctp", 333},
     {"socketpair$inet6_tcp", 333},
     {"socketpair$inet6_udp", 333},
     {"socketpair$inet_dccp", 333},
+    {"socketpair$inet_icmp", 333},
+    {"socketpair$inet_icmp_raw", 333},
     {"socketpair$inet_sctp", 333},
     {"socketpair$inet_tcp", 333},
     {"socketpair$inet_udp", 333},