status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpc/upnpc.c: use remoteHost arg of DeletePortMapping

This commit is contained in:
Thomas Bernard 2014-09-11 16:31:36 +02:00
parent 05cc5daf14
commit 0436d03757
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
miniupnpc/Changelog.txt
View File

@ -1,6 +1,9 @@
$Id: Changelog.txt,v 1.197 2014/09/06 08:31:39 nanard Exp $ $Id: Changelog.txt,v 1.198 2014/09/11 14:13:31 nanard Exp $
miniUPnP client Changelog. miniUPnP client Changelog.
2014/09/11:
use remoteHost arg of DeletePortMapping
2014/09/06: 2014/09/06:
Fix python3 build Fix python3 build

17
miniupnpc/upnpc.c
View File

@ -1,4 +1,4 @@
/* $Id: upnpc.c,v 1.102 2014/02/05 17:27:14 nanard Exp $ */ /* $Id: upnpc.c,v 1.104 2014/09/11 14:13:30 nanard Exp $ */
/* Project : miniupnp /* Project : miniupnp
* Author : Thomas Bernard * Author : Thomas Bernard
* Copyright (c) 2005-2014 Thomas Bernard * Copyright (c) 2005-2014 Thomas Bernard
@ -295,8 +295,9 @@ static void SetRedirectAndTest(struct UPNPUrls * urls,
static void static void
RemoveRedirect(struct UPNPUrls * urls, RemoveRedirect(struct UPNPUrls * urls,
struct IGDdatas * data, struct IGDdatas * data,
const char * eport, const char * eport,
const char * proto) const char * proto,
const char * remoteHost)
{ {
int r; int r;
if(!proto || !eport) if(!proto || !eport)
@ -310,7 +311,7 @@ RemoveRedirect(struct UPNPUrls * urls,
fprintf(stderr, "protocol invalid\n"); fprintf(stderr, "protocol invalid\n");
return; return;
} }
r = UPNP_DeletePortMapping(urls->controlURL, data->first.servicetype, eport, proto, 0); r = UPNP_DeletePortMapping(urls->controlURL, data->first.servicetype, eport, proto, remoteHost);
printf("UPNP_DeletePortMapping() returned : %d\n", r); printf("UPNP_DeletePortMapping() returned : %d\n", r);
} }
@ -584,7 +585,7 @@ int main(int argc, char ** argv)
|| (command == 'D' && commandargc<1)) || (command == 'D' && commandargc<1))
{ {
fprintf(stderr, "Usage :\t%s [options] -a ip port external_port protocol [duration]\n\t\tAdd port redirection\n", argv[0]); fprintf(stderr, "Usage :\t%s [options] -a ip port external_port protocol [duration]\n\t\tAdd port redirection\n", argv[0]);
fprintf(stderr, " \t%s [options] -d external_port protocol [port2 protocol2] [...]\n\t\tDelete port redirection\n", argv[0]); fprintf(stderr, " \t%s [options] -d external_port protocol <remote host>\n\t\tDelete port redirection\n", argv[0]);
fprintf(stderr, " \t%s [options] -s\n\t\tGet Connection status\n", argv[0]); fprintf(stderr, " \t%s [options] -s\n\t\tGet Connection status\n", argv[0]);
fprintf(stderr, " \t%s [options] -l\n\t\tList redirections\n", argv[0]); fprintf(stderr, " \t%s [options] -l\n\t\tList redirections\n", argv[0]);
fprintf(stderr, " \t%s [options] -L\n\t\tList redirections (using GetListOfPortMappings (for IGD:2 only)\n", argv[0]); fprintf(stderr, " \t%s [options] -L\n\t\tList redirections (using GetListOfPortMappings (for IGD:2 only)\n", argv[0]);
@ -677,10 +678,8 @@ int main(int argc, char ** argv)
description, 0); description, 0);
break; break;
case 'd': case 'd':
for(i=0; i<commandargc; i+=2) RemoveRedirect(&urls, &data, commandargv[0], commandargv[1],
{ commandargc > 2 ? commandargv[2] : NULL);
RemoveRedirect(&urls, &data, commandargv[i], commandargv[i+1]);
}
break; break;
case 'n': /* aNy */ case 'n': /* aNy */
SetRedirectAndTest(&urls, &data, SetRedirectAndTest(&urls, &data,