Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2018-11-09 08:51:10 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2018-11-09 10:05:12 (GMT) |
| commit | a45eed2d826f60a20dfd1f4f06df37d1f83263f8 (patch) | |
| tree | 7593509f9b89630ff70d5c9e1d14966435a4ab8a /Swiften/Network/NATPortMapping.h | |
| parent | 644db9fce94670e610db46bdd28eb9d1e658a798 (diff) | |
| download | swift-a45eed2d826f60a20dfd1f4f06df37d1f83263f8.zip swift-a45eed2d826f60a20dfd1f4f06df37d1f83263f8.tar.bz2 | |
Store NATPortMapping lifetime as uint32_t
The NAT-PMP RFC specifies lifetime as an unsigned, 32 bit integer, so
using this internally makes sense. This also removes the need for casts
in interface code.
A slight bug in the NATPMPInterface implementation to remove a mapping
has been addressed.
Test-Information:
Unit tests pass on macOS 10.13
Change-Id: I06687fd2735a8706f339f85d6c957ad7aadaaf02
Diffstat (limited to 'Swiften/Network/NATPortMapping.h')
| -rw-r--r-- | Swiften/Network/NATPortMapping.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Network/NATPortMapping.h b/Swiften/Network/NATPortMapping.h index b68052d..bf0fb1c 100644 --- a/Swiften/Network/NATPortMapping.h +++ b/Swiften/Network/NATPortMapping.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (c) 2015 Isode Limited. | 8 | * Copyright (c) 2015-2018 Isode Limited. |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * See the COPYING file for more information. | 10 | * See the COPYING file for more information. |
| 11 | */ | 11 | */ |
| @@ -23,7 +23,7 @@ namespace Swift { | |||
| 23 | UDP | 23 | UDP |
| 24 | }; | 24 | }; |
| 25 | 25 | ||
| 26 | NATPortMapping(unsigned short localPort, unsigned short publicPort, Protocol protocol = TCP, int leaseInSeconds = 60 * 60 * 24) : | 26 | NATPortMapping(unsigned short localPort, unsigned short publicPort, Protocol protocol = TCP, uint32_t 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 | } |
| @@ -40,7 +40,7 @@ namespace Swift { | |||
| 40 | return protocol; | 40 | return protocol; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | int getLeaseInSeconds() const { | 43 | uint32_t getLeaseInSeconds() const { |
| 44 | return leaseInSeconds; | 44 | return leaseInSeconds; |
| 45 | } | 45 | } |
| 46 | 46 | ||
| @@ -48,6 +48,6 @@ namespace Swift { | |||
| 48 | unsigned short publicPort; | 48 | unsigned short publicPort; |
| 49 | unsigned short localPort; | 49 | unsigned short localPort; |
| 50 | Protocol protocol; | 50 | Protocol protocol; |
| 51 | int leaseInSeconds; | 51 | uint32_t leaseInSeconds; |
| 52 | }; | 52 | }; |
| 53 | } | 53 | } |