From d888eb60e2d31e0b2685864a8b1338a459de1b41 Mon Sep 17 00:00:00 2001
From: Michael Chisholm <chisholm@mitre.org>
Date: Wed, 8 Jul 2020 14:26:02 -0400
Subject: [PATCH] Remove protocol_family and its uses from the v21 network
 socket SCO extension.  It's a 2.0 property that got copied into the 2.1 code
 by mistake.

---
 stix2/test/v21/test_observed_data.py |  5 -----
 stix2/v21/observables.py             | 10 ----------
 2 files changed, 15 deletions(-)

diff --git a/stix2/test/v21/test_observed_data.py b/stix2/test/v21/test_observed_data.py
index e0fa4560..00ee0551 100644
--- a/stix2/test/v21/test_observed_data.py
+++ b/stix2/test/v21/test_observed_data.py
@@ -1139,7 +1139,6 @@ def test_network_traffic_socket_example():
     h = stix2.v21.SocketExt(
         is_listening=True,
         address_family="AF_INET",
-        protocol_family="PF_INET",
         socket_type="SOCK_STREAM",
     )
     nt = stix2.v21.NetworkTraffic(
@@ -1149,7 +1148,6 @@ def test_network_traffic_socket_example():
     )
     assert nt.extensions['socket-ext'].is_listening
     assert nt.extensions['socket-ext'].address_family == "AF_INET"
-    assert nt.extensions['socket-ext'].protocol_family == "PF_INET"
     assert nt.extensions['socket-ext'].socket_type == "SOCK_STREAM"
 
 
@@ -1157,7 +1155,6 @@ def test_correct_socket_options():
     se1 = stix2.v21.SocketExt(
         is_listening=True,
         address_family="AF_INET",
-        protocol_family="PF_INET",
         socket_type="SOCK_STREAM",
         options={"ICMP6_RCVTIMEO": 100},
     )
@@ -1172,7 +1169,6 @@ def test_incorrect_socket_options():
         stix2.v21.SocketExt(
             is_listening=True,
             address_family="AF_INET",
-            protocol_family="PF_INET",
             socket_type="SOCK_STREAM",
             options={"RCVTIMEO": 100},
         )
@@ -1182,7 +1178,6 @@ def test_incorrect_socket_options():
         stix2.v21.SocketExt(
             is_listening=True,
             address_family="AF_INET",
-            protocol_family="PF_INET",
             socket_type="SOCK_STREAM",
             options={"SO_RCVTIMEO": '100'},
         )
diff --git a/stix2/v21/observables.py b/stix2/v21/observables.py
index 8266310e..55224cd9 100644
--- a/stix2/v21/observables.py
+++ b/stix2/v21/observables.py
@@ -503,16 +503,6 @@ class SocketExt(_Extension):
         ),
         ('is_blocking', BooleanProperty()),
         ('is_listening', BooleanProperty()),
-        (
-            'protocol_family', EnumProperty(allowed=[
-                "PF_INET",
-                "PF_IPX",
-                "PF_APPLETALK",
-                "PF_INET6",
-                "PF_AX25",
-                "PF_NETROM",
-            ]),
-        ),
         ('options', DictionaryProperty(spec_version='2.1')),
         (
             'socket_type', EnumProperty(allowed=[