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

Add delete_pinhole() function

This commit is contained in:
Thomas Bernard 2012-04-20 00:07:13 +02:00
parent 3bf2534620
commit 137932b776
3 changed files with 74 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
miniupnpd/pf/pfpinhole.c
View File

@ -1,4 +1,4 @@
/* $Id: pfpinhole.c,v 1.4 2012/04/18 23:44:51 nanard Exp $ */ /* $Id: pfpinhole.c,v 1.5 2012/04/19 22:02:12 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
@ -32,12 +32,13 @@
/* /dev/pf when opened */ /* /dev/pf when opened */
extern int dev; extern int dev;
static int uid = 1;
int add_pinhole (const char * ifname, int add_pinhole (const char * ifname,
const char * rem_host, unsigned short rem_port, const char * rem_host, unsigned short rem_port,
const char * int_client, unsigned short int_port, const char * int_client, unsigned short int_port,
int proto) int proto)
{ {
int r;
struct pfioc_rule pcr; struct pfioc_rule pcr;
#ifndef PF_NEWSTYLE #ifndef PF_NEWSTYLE
struct pfioc_pooladdr pp; struct pfioc_pooladdr pp;
@ -47,7 +48,6 @@ int add_pinhole (const char * ifname,
syslog(LOG_ERR, "pf device is not open"); syslog(LOG_ERR, "pf device is not open");
return -1; return -1;
} }
r = 0;
memset(&pcr, 0, sizeof(pcr)); memset(&pcr, 0, sizeof(pcr));
strlcpy(pcr.anchor, anchor_name, MAXPATHLEN); strlcpy(pcr.anchor, anchor_name, MAXPATHLEN);
@ -89,6 +89,8 @@ int add_pinhole (const char * ifname,
#endif #endif
pcr.rule.keep_state = 1; pcr.rule.keep_state = 1;
/*strlcpy(pcr.rule.label, desc, PF_RULE_LABEL_SIZE);*/ /*strlcpy(pcr.rule.label, desc, PF_RULE_LABEL_SIZE);*/
snprintf(pcr.rule.label, PF_RULE_LABEL_SIZE,
"pinhole-%d", uid);
if(queue) if(queue)
strlcpy(pcr.rule.qname, queue, PF_QNAME_SIZE); strlcpy(pcr.rule.qname, queue, PF_QNAME_SIZE);
if(tag) if(tag)
@ -130,6 +132,54 @@ int add_pinhole (const char * ifname,
} }
} }
return 0; return (uid++);
} }
int delete_pinhole (unsigned short uid)
{
int i, n;
struct pfioc_rule pr;
char label[PF_RULE_LABEL_SIZE];
if(dev<0) {
syslog(LOG_ERR, "pf device is not open");
return -1;
}
snprintf(label, sizeof(label),
"pinhole-%hu", uid);
memset(&pr, 0, sizeof(pr));
strlcpy(pr.anchor, anchor_name, MAXPATHLEN);
#ifndef PF_NEWSTYLE
pr.rule.action = PF_PASS;
#endif
if(ioctl(dev, DIOCGETRULES, &pr) < 0) {
syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...): %m");
return -1;
}
n = pr.nr;
for(i=0; i<n; i++) {
pr.nr = i;
if(ioctl(dev, DIOCGETRULE, &pr) < 0) {
syslog(LOG_ERR, "ioctl(dev, DIOCGETRULE): %m");
return -1;
}
if(0 == strcmp(pr.rule.label, label)) {
pr.action = PF_CHANGE_GET_TICKET;
if(ioctl(dev, DIOCCHANGERULE, &pr) < 0) {
syslog(LOG_ERR, "ioctl(dev, DIOCCHANGERULE, ...) PF_CHANGE_GET_TICKET: %m");
return -1;
}
pr.action = PF_CHANGE_REMOVE;
pr.nr = i;
if(ioctl(dev, DIOCCHANGERULE, &pr) < 0) {
syslog(LOG_ERR, "ioctl(dev, DIOCCHANGERULE, ...) PF_CHANGE_REMOVE: %m");
return -1;
}
return 0;
}
}
/* not found */
return -1;
}

4
miniupnpd/pf/pfpinhole.h
View File

@ -1,4 +1,4 @@
/* $Id: pfpinhole.h,v 1.1 2012/04/18 20:45:33 nanard Exp $ */ /* $Id: pfpinhole.h,v 1.2 2012/04/19 22:02:12 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) 2012 Thomas Bernard * (c) 2012 Thomas Bernard
@ -13,5 +13,7 @@ int add_pinhole (const char * ifname,
const char * int_client, unsigned short int_port, const char * int_client, unsigned short int_port,
int proto); int proto);
int delete_pinhole (unsigned short uid);
#endif #endif

20
miniupnpd/pf/testpfpinhole.c
View File

@ -1,4 +1,4 @@
/* $Id: testpfpinhole.c,v 1.2 2012/04/18 23:44:51 nanard Exp $ */ /* $Id: testpfpinhole.c,v 1.3 2012/04/19 22:02:12 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
@ -22,6 +22,7 @@ const char * queue = NULL;
int main(int argc, char * *argv) int main(int argc, char * *argv)
{ {
int uid;
int ret; int ret;
openlog("testpfpinhole", LOG_PERROR, LOG_USER); openlog("testpfpinhole", LOG_PERROR, LOG_USER);
@ -30,8 +31,21 @@ int main(int argc, char * *argv)
return 1; return 1;
} }
ret = add_pinhole("ep0", "2001::1:2:3", 12345, "123::ff", 54321, IPPROTO_UDP); uid = add_pinhole("ep0", "2001::1:2:3", 12345, "123::ff", 54321, IPPROTO_UDP);
ret = add_pinhole("ep0", NULL, 0, "dead:beef::42:42", 8080, IPPROTO_UDP); if(uid < 0) {
fprintf(stderr, "add_pinhole() failed\n");
}
printf("add_pinhole() returned %d\n", uid);
uid = add_pinhole("ep0", NULL, 0, "dead:beef::42:42", 8080, IPPROTO_UDP);
if(uid < 0) {
fprintf(stderr, "add_pinhole() failed\n");
}
printf("add_pinhole() returned %d\n", uid);
ret = delete_pinhole(1);
printf("delete_pinhole() returned %d\n", ret);
ret = delete_pinhole(2);
printf("delete_pinhole() returned %d\n", ret);
return 0; return 0;
} }