Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
flamenco-worker-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
flamenco-worker-python
Commits
6cc476ac
Commit
6cc476ac
authored
7 years ago
by
Sybren A. Stüvel
Browse files
Options
Downloads
Patches
Plain Diff
SSDP discovery: fixed Windows compatibility
parent
631c9a23
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
flamenco_worker/ssdp_discover.py
+6
-0
6 additions, 0 deletions
flamenco_worker/ssdp_discover.py
with
7 additions
and
0 deletions
CHANGELOG.md
+
1
−
0
View file @
6cc476ac
...
@@ -10,6 +10,7 @@ changed functionality, fixed bugs).
...
@@ -10,6 +10,7 @@ changed functionality, fixed bugs).
to edit
`flamenco-worker.cfg`
.
to edit
`flamenco-worker.cfg`
.
-
Only fail UPnP/SSDP discovery when it fails to send on both IPv4 and IPv6.
-
Only fail UPnP/SSDP discovery when it fails to send on both IPv4 and IPv6.
-
Creating distribution files using
[
PyInstaller
](
http://www.pyinstaller.org/
)
.
-
Creating distribution files using
[
PyInstaller
](
http://www.pyinstaller.org/
)
.
-
Fixed UPnP/SSDP discovery issues on Windows.
## Version 2.0.7 (released 2017-07-04)
## Version 2.0.7 (released 2017-07-04)
...
...
This diff is collapsed.
Click to expand it.
flamenco_worker/ssdp_discover.py
+
6
−
0
View file @
6cc476ac
...
@@ -67,8 +67,14 @@ def find_flamenco_manager(timeout=1, retries=5):
...
@@ -67,8 +67,14 @@ def find_flamenco_manager(timeout=1, retries=5):
except
OSError
:
except
OSError
:
# Not supported on Windows and AF_INET6.
# Not supported on Windows and AF_INET6.
pass
pass
sock
.
bind
((
''
,
1901
))
sock
.
bind
((
''
,
1901
))
# Required on Windows, otherwise the message won't go out.
if
family
==
socket
.
AF_INET
:
host
=
socket
.
gethostbyname
(
socket
.
gethostname
())
sock
.
setsockopt
(
socket
.
SOL_IP
,
socket
.
IP_MULTICAST_IF
,
socket
.
inet_aton
(
host
))
try
:
try
:
for
_
in
range
(
2
):
for
_
in
range
(
2
):
# sending it more than once will
# sending it more than once will
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment