|
|
|
@ -14,8 +14,7 @@ import os
|
|
|
|
|
|
|
|
|
|
import hostapd
|
|
|
|
|
import hwsim_utils
|
|
|
|
|
import utils
|
|
|
|
|
from utils import HwsimSkip
|
|
|
|
|
from utils import *
|
|
|
|
|
from wpasupplicant import WpaSupplicant
|
|
|
|
|
from p2p_utils import *
|
|
|
|
|
from test_p2p_messages import parse_p2p_public_action, p2p_hdr, p2p_attr_capability, p2p_attr_go_intent, p2p_attr_config_timeout, p2p_attr_listen_channel, p2p_attr_intended_interface_addr, p2p_attr_channel_list, p2p_attr_device_info, p2p_attr_operating_channel, ie_p2p, ie_wsc, mgmt_tx, P2P_GO_NEG_REQ
|
|
|
|
@ -46,7 +45,7 @@ def test_grpform_a(dev):
|
|
|
|
|
raise Exception("Unexpected group interface name")
|
|
|
|
|
check_grpform_results(i_res, r_res)
|
|
|
|
|
remove_group(dev[0], dev[1])
|
|
|
|
|
if i_res['ifname'] in utils.get_ifnames():
|
|
|
|
|
if i_res['ifname'] in get_ifnames():
|
|
|
|
|
raise Exception("Group interface netdev was not removed")
|
|
|
|
|
|
|
|
|
|
def test_grpform_b(dev):
|
|
|
|
@ -67,7 +66,7 @@ def test_grpform_b(dev):
|
|
|
|
|
if "FAIL" not in dev[0].group_request("P2P_GROUP_MEMBER 00:11:22:33:44:55"):
|
|
|
|
|
raise Exception("P2P_GROUP_MEMBER for non-member accepted")
|
|
|
|
|
remove_group(dev[0], dev[1])
|
|
|
|
|
if r_res['ifname'] in utils.get_ifnames():
|
|
|
|
|
if r_res['ifname'] in get_ifnames():
|
|
|
|
|
raise Exception("Group interface netdev was not removed")
|
|
|
|
|
|
|
|
|
|
def test_grpform_c(dev):
|
|
|
|
@ -82,9 +81,9 @@ def test_grpform_c(dev):
|
|
|
|
|
raise Exception("Unexpected group interface name")
|
|
|
|
|
check_grpform_results(i_res, r_res)
|
|
|
|
|
remove_group(dev[0], dev[1])
|
|
|
|
|
if i_res['ifname'] in utils.get_ifnames():
|
|
|
|
|
if i_res['ifname'] in get_ifnames():
|
|
|
|
|
raise Exception("Group interface netdev was not removed")
|
|
|
|
|
if r_res['ifname'] in utils.get_ifnames():
|
|
|
|
|
if r_res['ifname'] in get_ifnames():
|
|
|
|
|
raise Exception("Group interface netdev was not removed")
|
|
|
|
|
|
|
|
|
|
@remote_compatible
|
|
|
|
@ -99,9 +98,9 @@ def test_grpform2_c(dev):
|
|
|
|
|
dev[1].global_request("SET p2p_no_group_iface 0")
|
|
|
|
|
[i_res, r_res] = go_neg_pin_authorized(i_dev=dev[0], i_intent=0, r_dev=dev[1], r_intent=15)
|
|
|
|
|
remove_group(dev[0], dev[1])
|
|
|
|
|
if i_res['ifname'] in utils.get_ifnames():
|
|
|
|
|
if i_res['ifname'] in get_ifnames():
|
|
|
|
|
raise Exception("Group interface netdev was not removed")
|
|
|
|
|
if r_res['ifname'] in utils.get_ifnames():
|
|
|
|
|
if r_res['ifname'] in get_ifnames():
|
|
|
|
|
raise Exception("Group interface netdev was not removed")
|
|
|
|
|
|
|
|
|
|
@remote_compatible
|
|
|
|
@ -116,9 +115,9 @@ def test_grpform3_c(dev):
|
|
|
|
|
dev[1].global_request("SET p2p_no_group_iface 0")
|
|
|
|
|
[i_res, r_res] = go_neg_pin(i_dev=dev[0], i_intent=15, r_dev=dev[1], r_intent=0)
|
|
|
|
|
remove_group(dev[0], dev[1])
|
|
|
|
|
if i_res['ifname'] in utils.get_ifnames():
|
|
|
|
|
if i_res['ifname'] in get_ifnames():
|
|
|
|
|
raise Exception("Group interface netdev was not removed")
|
|
|
|
|
if r_res['ifname'] in utils.get_ifnames():
|
|
|
|
|
if r_res['ifname'] in get_ifnames():
|
|
|
|
|
raise Exception("Group interface netdev was not removed")
|
|
|
|
|
|
|
|
|
|
@remote_compatible
|
|
|
|
@ -734,11 +733,9 @@ def test_grpform_goneg_fail_with_group_iface(dev):
|
|
|
|
|
if ev is None:
|
|
|
|
|
raise Exception("GO Negotiation failure timed out")
|
|
|
|
|
|
|
|
|
|
def test_grpform_cred_ready_timeout(dev, apdev, params):
|
|
|
|
|
"""P2P GO Negotiation wait for credentials to become ready [long]"""
|
|
|
|
|
if not params['long']:
|
|
|
|
|
raise HwsimSkip("Skip test case with long duration due to --long not specified")
|
|
|
|
|
|
|
|
|
|
@long_duration_test
|
|
|
|
|
def test_grpform_cred_ready_timeout(dev):
|
|
|
|
|
"""P2P GO Negotiation wait for credentials to become ready"""
|
|
|
|
|
dev[1].p2p_listen()
|
|
|
|
|
addr1 = dev[1].p2p_dev_addr()
|
|
|
|
|
if not dev[0].discover_peer(addr1):
|
|
|
|
@ -1181,7 +1178,7 @@ def test_grpform_random_addr(dev):
|
|
|
|
|
check_grpform_results(i_res, r_res)
|
|
|
|
|
hwsim_utils.test_connectivity_p2p(dev[0], dev[1])
|
|
|
|
|
remove_group(dev[0], dev[1])
|
|
|
|
|
if i_res['ifname'] in utils.get_ifnames():
|
|
|
|
|
if i_res['ifname'] in get_ifnames():
|
|
|
|
|
raise Exception("Group interface netdev was not removed")
|
|
|
|
|
finally:
|
|
|
|
|
dev[0].global_request("SET p2p_interface_random_mac_addr 0")
|
|
|
|
|