mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-08 14:42:51 -04:00
Calm down p3netmgr at least when internet connection is not available
Solve compiler warnings, delete tons of cruft and deadcode
This commit is contained in:
parent
6788ea041a
commit
6b71c57a54
16 changed files with 120 additions and 2288 deletions
|
@ -1,5 +1,5 @@
|
|||
/*******************************************************************************
|
||||
* libretroshare/src/upnp: upnphandler_linux.cc *
|
||||
* libretroshare/src/upnp: upnphandler_libupnp.cc *
|
||||
* *
|
||||
* libretroshare: retroshare core library *
|
||||
* *
|
||||
|
@ -28,7 +28,7 @@ extern "C" {
|
|||
#endif
|
||||
/* This stuff is actually C */
|
||||
|
||||
#include "rs_upnp/upnphandler_linux.h"
|
||||
#include "rs_upnp/upnphandler_libupnp.h"
|
||||
|
||||
#include "util/rsnet.h"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*******************************************************************************
|
||||
* libretroshare/src/upnp: upnphandler_linux.h *
|
||||
* libretroshare/src/upnp: upnphandler_libupnp.h *
|
||||
* *
|
||||
* libretroshare: retroshare core library *
|
||||
* *
|
||||
|
@ -19,8 +19,7 @@
|
|||
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
|
||||
* *
|
||||
*******************************************************************************/
|
||||
#ifndef _RS_UPNP_IFACE_H
|
||||
#define _RS_UPNP_IFACE_H
|
||||
#pragma once
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
@ -99,5 +98,3 @@ class upnphandler: public pqiNetAssistFirewall
|
|||
|
||||
/* info from upnp */
|
||||
int CtrlPointCallbackEventHandler(Upnp_EventType ,void* , void*);
|
||||
|
||||
#endif /* _RS_UPNP_IFACE_H */
|
|
@ -19,12 +19,9 @@
|
|||
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
|
||||
* *
|
||||
*******************************************************************************/
|
||||
//windows/osx (miniupnpc) implementation
|
||||
#ifndef _RS_UPNP_IFACE_H
|
||||
#define _RS_UPNP_IFACE_H
|
||||
#pragma once
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
||||
|
@ -127,5 +124,3 @@ bool checkUPnPActive();
|
|||
std::list<upnpforward> activeForwards;
|
||||
|
||||
};
|
||||
|
||||
#endif /* _RS_UPNP_IFACE_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue