Skip to content

Add option to specify probe types #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreikop merged 1 commit into from
Dec 13, 2024
Merged

Add option to specify probe types #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions wsdiscovery/cmdline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ def setup_logger(name, loglevel):


@click.command(context_settings=CONTEXT_SETTINGS)
@click.option('--scope', '-s', help='Full scope URI, eg. onvif://www.onvif.org/Model/')
@click.option('--scope', '-s', help='Probe scope URI, e.g. onvif://www.onvif.org/Model/')
@click.option('--type', '-y', 'ptype', nargs=3, type=(str, str, str), multiple=True,
help='Probe type in this order: NS_URI NS_PREFIX LOCAL_NAME,'
' e.g. http://www.onvif.org/ver10/network/wsdl dp0 NetworkVideoTransmitter'
' -- this option can be specified multiple times')
@click.option('--address', '-a', help='Service address')
@click.option('--port', '-p', type=int, help='Service port')
@click.option('--loglevel', '-l', default=DEFAULT_LOGLEVEL, show_default=True,
Expand All @@ -59,16 +63,22 @@ def setup_logger(name, loglevel):
show_default=True, help='Number of Multicast messages to send')
@click.option('--relates-to', '-rt', is_flag=True,
help='Also use RelatesTo tag to recognize incoming messages.')
def discover(scope, address, port, loglevel, capture, timeout, unicast_num,
multicast_num, relates_to):
def discover(scope, ptype, address, port, loglevel, capture, timeout,
unicast_num, multicast_num, relates_to):
"Discover services using WS-Discovery"

logger = setup_logger("ws-discovery", loglevel)

probe_types = []
for type_tuple in ptype:
probe_types.append(QName(type_tuple[0], type_tuple[2], type_tuple[1]))
if len(probe_types) == 0:
probe_types = None

with discovery(capture, unicast_num, multicast_num, relates_to) as wsd:
scopes = [Scope(scope)] if scope else []
svcs = wsd.searchServices(scopes=scopes, address=address, port=port,
timeout=timeout)
svcs = wsd.searchServices(types=probe_types, scopes=scopes,
address=address, port=port, timeout=timeout)
print("\nDiscovered:\n")
for service in svcs:
url = urlparse(service.getXAddrs()[0])
Expand Down
Loading