Commit Graph

20 Commits

Author SHA1 Message Date
75eef9ef2f
Fix merge conflicts
Missed this difference in the last commit
2016-05-02 17:33:18 +02:00
aabf600c38
Fix incorrectly resolved merge conflicts
Two file merge conflicts, __init__.py and upnp.py, were not resolved
correctly by the automatic resolving (probably because the affected code
was written by other people and I merged them into mailchuck fork). This
changes it to the same code that is in the mailchuck fork)
2016-05-02 17:10:45 +02:00
mailchuck
9edde110a2 Translation update
Some function calls were not being identified as text that should be
translated.
2016-05-02 15:00:26 +02:00
1b50f3898a UPnP fixes:
- external port iterator fix
- error handler fix
2016-05-02 15:00:24 +02:00
mailchuck
a1b44aab44 UPnP fixes
- UPnP handles errors better
- it tries to bind external interface (previously sometimes it searched
on 127.0.0.1 resulting in no routers being detected)
2016-05-02 15:00:24 +02:00
mailchuck
4033b945ee UPnP status bar update fix 2016-05-02 15:00:23 +02:00
mailchuck
1b36da9327 Save UPnP port
Fixes #129
2016-05-02 15:00:23 +02:00
mailchuck
f77afe8fae Exception handling 2016-05-02 15:00:21 +02:00
mailchuck
36ddbd365e Typo 2016-05-02 15:00:21 +02:00
mailchuck
410c23e8c0 Typo 2016-05-02 15:00:21 +02:00
mailchuck
e82e33fa51 UPnP notifications
UPnP will notify you through window status bar.
2016-05-02 15:00:21 +02:00
mailchuck
bbdfb1ea54 UPnP cleaner shutdown 2016-05-02 15:00:21 +02:00
mailchuck
b00c4f24ec Threads close better
- UPnP and outgoingSynSender threads close slightly better.
- extPort initialisation was missing
2016-05-02 15:00:21 +02:00
mailchuck
48b9e50397 UPnP GUI
Settings GUI now contains a checkbox for UPnP and auto starts/stops the
thread when changed.
Default UPnP socket timeout decreased for faster thread
starting/stopping
2016-05-02 15:00:21 +02:00
mailchuck
50be5a2b4c UPnP fixes 2016-05-02 15:00:21 +02:00
mailchuck
c03c563a74 Make UPnP into a thread
- UPnP is now a separate thread that will continue to setup UPnP
- shutdown waits for threads that shutdown correctly (Addresses
Bitmessage#549)
2016-05-02 15:00:21 +02:00
mailchuck
cc848cdb65 Typo fix 2016-05-02 15:00:21 +02:00
mailchuck
5432c6e0c8 UPnP logging improvlement 2016-05-02 15:00:21 +02:00
0270dc3d4d Cleanup UPnP 2016-05-02 15:00:21 +02:00
lightrabbit
f0f9f679e6 Add UPnP support. 2016-05-02 15:00:17 +02:00