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

miniupnpd: Add -A command line option to add permission rules 

fixes #15
This commit is contained in:
Thomas Bernard 2012-07-17 21:39:40 +02:00
parent 5a07e704ba
commit 04e56b13e1
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
miniupnpd/Changelog.txt
View File

@ -1,4 +1,7 @@
$Id: Changelog.txt,v 1.294 2012/07/14 15:12:50 nanard Exp $ $Id: Changelog.txt,v 1.295 2012/07/17 19:35:43 nanard Exp $
2012/07/17:
Add -A command line option to add permission rules
2012/07/14: 2012/07/14:
Add -z command line option to change friendly name (thanks to Shawn Fisher) Add -z command line option to change friendly name (thanks to Shawn Fisher)

25
miniupnpd/miniupnpd.c
View File

@ -1,4 +1,4 @@
/* $Id: miniupnpd.c,v 1.166 2012/07/14 15:12:51 nanard Exp $ */ /* $Id: miniupnpd.c,v 1.168 2012/07/17 19:35:44 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* (c) 2006-2012 Thomas Bernard * (c) 2006-2012 Thomas Bernard
@ -1048,6 +1048,23 @@ init(int argc, char * * argv, struct runtime_vars * v)
fprintf(stderr, "Option -%c takes two arguments.\n", argv[i][1]); fprintf(stderr, "Option -%c takes two arguments.\n", argv[i][1]);
#endif #endif
break; break;
case 'A':
if(i+1 < argc) {
void * tmp;
tmp = realloc(upnppermlist, sizeof(struct upnpperm) * (num_upnpperm+1));
if(tmp == NULL) {
fprintf(stderr, "memory allocation error for permission\n");
} else {
upnppermlist = tmp;
if(read_permission_line(upnppermlist + num_upnpperm, argv[++i]) >= 0) {
num_upnpperm++;
} else {
fprintf(stderr, "Permission rule parsing error :\n%s\n", argv[i]);
}
}
} else
fprintf(stderr, "Option -%c takes one argument.\n", argv[i][1]);
break;
case 'f': case 'f':
i++; /* discarding, the config file is already read */ i++; /* discarding, the config file is already read */
break; break;
@ -1189,6 +1206,7 @@ print_usage:
#ifdef ENABLE_NFQUEUE #ifdef ENABLE_NFQUEUE
"\t\t[-Q queue] [-n name]\n" "\t\t[-Q queue] [-n name]\n"
#endif #endif
"\t\t[-A \"permission rule\"]\n"
"\nNotes:\n\tThere can be one or several listening_ips.\n" "\nNotes:\n\tThere can be one or several listening_ips.\n"
"\tNotify interval is in seconds. Default is 30 seconds.\n" "\tNotify interval is in seconds. Default is 30 seconds.\n"
"\tDefault pid file is '%s'.\n" "\tDefault pid file is '%s'.\n"
@ -1213,6 +1231,11 @@ print_usage:
"\t-Q sets the queue number that is used by NFQUEUE.\n" "\t-Q sets the queue number that is used by NFQUEUE.\n"
"\t-n sets the name of the interface(s) that packets will arrive on.\n" "\t-n sets the name of the interface(s) that packets will arrive on.\n"
#endif #endif
"\t-A use following syntax for permission rules :\n"
"\t (allow|deny) (external port range) ip/mask (internal port range)\n"
"\texamples :\n"
"\t \"allow 1024-65535 192.168.1.0/24 1024-65535\"\n"
"\t \"deny 0-65535 0.0.0.0/0 0-65535\"\n"
"\t-h prints this help and quits.\n" "\t-h prints this help and quits.\n"
"", argv[0], pidfilename, DEFAULT_CONFIG); "", argv[0], pidfilename, DEFAULT_CONFIG);
return 1; return 1;