8 Commits

Author	SHA1	Message	Date
Adam Ierymenko	436c1fac1d	Selectively move over changes from "edge" to "dev" excluding netcon.	2015-12-21 16:15:39 -08:00
Adam Ierymenko	c21882da9c	Put selftest back and turn off tracing in PortMapper.	2015-11-30 16:07:02 -08:00
Adam Ierymenko	d862d2868c	... and here.	2015-11-30 14:57:28 -08:00
Adam Ierymenko	1e213b4d4c	Need to close on premature abort too or resources are leaked.	2015-11-30 14:56:36 -08:00
Adam Ierymenko	3d66492828	Also add a timeout for the actual NAT-PMP port mapping step.	2015-11-30 14:17:58 -08:00
Adam Ierymenko	685c5e9ad1	Fix for uPnP	2015-11-30 13:25:34 -08:00
Adam Ierymenko	66a29a00ee	Merge miniupnpc/libnatpmp build into main build by just adding flags, defs, and objs.	2015-11-30 13:17:43 -08:00
Adam Ierymenko	6768521330	Ton of uPnP work and adding NAT-PMP support, still testing...	2015-11-30 13:10:22 -08:00