Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2018-10-29 16:28:14 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2018-11-08 11:31:20 (GMT) |
| commit | cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f (patch) | |
| tree | 69e11e13ff2e5127d2cbfcc164be761cf104a1b2 /Swiften/Network/NATPortMapping.h | |
| parent | 5ce9e19ef0744f530a797c30a82e9723eb7ea306 (diff) | |
| download | swift-cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f.zip swift-cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f.tar.bz2 | |
Consistently use unsigned short for network ports
Network ports are now consistently stored as unsigned shorts, apart from
the options and user interface, where -1 is still used to denote the use
of default ports.
Test-Information:
Unit tests pass on macOS 10.13 and Debian 9
On macOS: tested the UI with various proxy and manual ports, behaviour
as expected.
Change-Id: I7a65f40083022887aa30ed7b21eadc56d0c52be1
Diffstat (limited to 'Swiften/Network/NATPortMapping.h')
| -rw-r--r-- | Swiften/Network/NATPortMapping.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Network/NATPortMapping.h b/Swiften/Network/NATPortMapping.h index ff8fde3..b68052d 100644 --- a/Swiften/Network/NATPortMapping.h +++ b/Swiften/Network/NATPortMapping.h | |||
| @@ -23,16 +23,16 @@ namespace Swift { | |||
| 23 | UDP | 23 | UDP |
| 24 | }; | 24 | }; |
| 25 | 25 | ||
| 26 | NATPortMapping(int localPort, int publicPort, Protocol protocol = TCP, int leaseInSeconds = 60 * 60 * 24) : | 26 | NATPortMapping(unsigned short localPort, unsigned short publicPort, Protocol protocol = TCP, int leaseInSeconds = 60 * 60 * 24) : |
| 27 | publicPort(publicPort), localPort(localPort), protocol(protocol), leaseInSeconds(leaseInSeconds) { | 27 | publicPort(publicPort), localPort(localPort), protocol(protocol), leaseInSeconds(leaseInSeconds) { |
| 28 | 28 | ||
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | int getPublicPort() const { | 31 | unsigned short getPublicPort() const { |
| 32 | return publicPort; | 32 | return publicPort; |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | int getLocalPort() const { | 35 | unsigned short getLocalPort() const { |
| 36 | return localPort; | 36 | return localPort; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| @@ -45,8 +45,8 @@ namespace Swift { | |||
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | private: | 47 | private: |
| 48 | int publicPort; | 48 | unsigned short publicPort; |
| 49 | int localPort; | 49 | unsigned short localPort; |
| 50 | Protocol protocol; | 50 | Protocol protocol; |
| 51 | int leaseInSeconds; | 51 | int leaseInSeconds; |
| 52 | }; | 52 | }; |