miniupnpd: removed unused code
ScanNATPMPforExpiration() CleanExpiredNATPMP() are not used anymore
This commit is contained in:
Thomas Bernard
parent
18db1145ea
commit
3712118bc4
|
|
@ -1,7 +1,7 @@
|
|||
/* $Id: miniupnpd.c,v 1.178 2013/12/13 14:10:02 nanard Exp $ */
|
||||
/* $Id: miniupnpd.c,v 1.182 2014/02/03 08:37:32 nanard Exp $ */
|
||||
/* MiniUPnP project
|
||||
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||
* (c) 2006-2013 Thomas Bernard
|
||||
* (c) 2006-2014 Thomas Bernard
|
||||
* This software is subject to the conditions detailed
|
||||
* in the LICENCE file provided within the distribution */
|
||||
|
||||
|
|
@ -1515,9 +1515,6 @@ main(int argc, char * * argv)
|
|||
syslog(LOG_NOTICE, "Listening for NAT-PMP traffic on port %u",
|
||||
NATPMP_PORT);
|
||||
}
|
||||
#endif
|
||||
#if 0
|
||||
ScanNATPMPforExpiration();
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1631,28 +1628,6 @@ main(int argc, char * * argv)
|
|||
syslog(LOG_DEBUG, "setting timeout to %u sec",
|
||||
(unsigned)timeout.tv_sec);
|
||||
}
|
||||
#ifdef ENABLE_NATPMP
|
||||
#if 0
|
||||
/* Remove expired NAT-PMP mappings */
|
||||
while(nextnatpmptoclean_timestamp
|
||||
&& (timeofday.tv_sec >= nextnatpmptoclean_timestamp + startup_time))
|
||||
{
|
||||
/*syslog(LOG_DEBUG, "cleaning expired NAT-PMP mappings");*/
|
||||
if(CleanExpiredNATPMP() < 0) {
|
||||
syslog(LOG_ERR, "CleanExpiredNATPMP() failed");
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(nextnatpmptoclean_timestamp
|
||||
&& timeout.tv_sec >= (nextnatpmptoclean_timestamp + startup_time - timeofday.tv_sec))
|
||||
{
|
||||
/*syslog(LOG_DEBUG, "setting timeout to %d sec",
|
||||
nextnatpmptoclean_timestamp + startup_time - timeofday.tv_sec);*/
|
||||
timeout.tv_sec = nextnatpmptoclean_timestamp + startup_time - timeofday.tv_sec;
|
||||
timeout.tv_usec = 0;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
#ifdef ENABLE_6FC_SERVICE
|
||||
/* Clean up expired IPv6 PinHoles */
|
||||
next_pinhole_ts = 0;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: natpmp.c,v 1.35 2013/12/13 14:07:08 nanard Exp $ */
|
||||
/* $Id: natpmp.c,v 1.36 2014/02/01 17:17:35 nanard Exp $ */
|
||||
/* MiniUPnP project
|
||||
* (c) 2007-2013 Thomas Bernard
|
||||
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||
|
|
@ -334,67 +334,6 @@ void ProcessIncomingNATPMPPacket(int s, unsigned char *msg_buff, int len,
|
|||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* iterate through the redirection list to find those who came
|
||||
* from NAT-PMP and select the first to expire */
|
||||
int ScanNATPMPforExpiration()
|
||||
{
|
||||
char desc[64];
|
||||
unsigned short iport, eport;
|
||||
int proto;
|
||||
int r, i;
|
||||
unsigned timestamp;
|
||||
nextnatpmptoclean_eport = 0;
|
||||
nextnatpmptoclean_timestamp = 0;
|
||||
for(i = 0; ; i++) {
|
||||
r = get_redirect_rule_by_index(i, 0, &eport, 0, 0,
|
||||
&iport, &proto, desc, sizeof(desc),
|
||||
×tamp, 0, 0);
|
||||
if(r<0)
|
||||
break;
|
||||
if(sscanf(desc, "NAT-PMP %u", ×tamp) == 1) {
|
||||
if( !nextnatpmptoclean_eport
|
||||
|| timestamp < nextnatpmptoclean_timestamp) {
|
||||
nextnatpmptoclean_eport = eport;
|
||||
nextnatpmptoclean_proto = proto;
|
||||
nextnatpmptoclean_timestamp = timestamp;
|
||||
syslog(LOG_DEBUG, "set nextnatpmptoclean_timestamp to %u", timestamp);
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* remove the next redirection that is expired
|
||||
*/
|
||||
int CleanExpiredNATPMP()
|
||||
{
|
||||
char desc[64];
|
||||
unsigned timestamp;
|
||||
unsigned short iport;
|
||||
if(get_redirect_rule(ext_if_name, nextnatpmptoclean_eport,
|
||||
nextnatpmptoclean_proto,
|
||||
0, 0,
|
||||
&iport, desc, sizeof(desc), ×tamp, 0, 0) < 0)
|
||||
return ScanNATPMPforExpiration();
|
||||
/* check desc - this is important since we keep expiration time as part
|
||||
* of the desc.
|
||||
* If the rule is renewed, timestamp and nextnatpmptoclean_timestamp
|
||||
* can be different. In that case, the rule must not be removed ! */
|
||||
if(sscanf(desc, "NAT-PMP %u", ×tamp) == 1) {
|
||||
if(timestamp > nextnatpmptoclean_timestamp)
|
||||
return ScanNATPMPforExpiration();
|
||||
}
|
||||
/* remove redirection then search for next one:) */
|
||||
if(_upnp_delete_redir(nextnatpmptoclean_eport, nextnatpmptoclean_proto)<0)
|
||||
return -1;
|
||||
syslog(LOG_INFO, "Expired NAT-PMP mapping port %hu %s removed",
|
||||
nextnatpmptoclean_eport,
|
||||
nextnatpmptoclean_proto==IPPROTO_TCP?"TCP":"UDP");
|
||||
return ScanNATPMPforExpiration();
|
||||
}
|
||||
#endif
|
||||
|
||||
/* SendNATPMPPublicAddressChangeNotification()
|
||||
* should be called when the public IP address changed */
|
||||
void SendNATPMPPublicAddressChangeNotification(int * sockets, int n_sockets)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: natpmp.h,v 1.8 2011/05/27 21:36:22 nanard Exp $ */
|
||||
/* $Id: natpmp.h,v 1.11 2014/02/01 17:17:35 nanard Exp $ */
|
||||
/* MiniUPnP project
|
||||
* author : Thomas Bernard
|
||||
* website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||
|
|
@ -26,12 +26,6 @@ int ReceiveNATPMPOrPCPPacket(int s, struct sockaddr_in* senderaddr,
|
|||
void ProcessIncomingNATPMPPacket(int s, unsigned char *msg_buff, int len,
|
||||
struct sockaddr_in *senderaddr);
|
||||
|
||||
#if 0
|
||||
int ScanNATPMPforExpiration(void);
|
||||
|
||||
int CleanExpiredNATPMP(void);
|
||||
#endif
|
||||
|
||||
void SendNATPMPPublicAddressChangeNotification(int * sockets, int n_sockets);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue