Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-27 15:57:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed compilation and re-licensed zeroconf/

Browse Source
This commit is contained in:
csoler 2018-05-30 21:45:18 +02:00
parent bc63726c4c
commit b0f391d66f
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
12 changed files with 84 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/libretroshare.pro
View File

@ -418,7 +418,6 @@ HEADERS += pqi/authssl.h \
pqi/pqiqos.h \ pqi/pqiqos.h \
pqi/pqi.h \ pqi/pqi.h \
pqi/pqi_base.h \ pqi/pqi_base.h \
pqi/pqiarchive.h \
pqi/pqiassist.h \ pqi/pqiassist.h \
pqi/pqibin.h \ pqi/pqibin.h \
pqi/pqihandler.h \ pqi/pqihandler.h \
@ -576,7 +575,6 @@ SOURCES += pqi/authgpg.cc \
pqi/p3netmgr.cc \ pqi/p3netmgr.cc \
pqi/p3notify.cc \ pqi/p3notify.cc \
pqi/pqiqos.cc \ pqi/pqiqos.cc \
pqi/pqiarchive.cc \
pqi/pqibin.cc \ pqi/pqibin.cc \
pqi/pqihandler.cc \ pqi/pqihandler.cc \
pqi/p3historymgr.cc \ pqi/p3historymgr.cc \

2
libretroshare/src/pgp/pgphandler.cc
View File

@ -19,8 +19,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * * along with this program. If not, see <https://www.gnu.org/licenses/>. *
* * * *
*******************************************************************************/ *******************************************************************************/
#pragma once
#include <stdexcept> #include <stdexcept>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>

2
libretroshare/src/pgp/pgpkeyutil.cc
View File

@ -19,8 +19,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * * along with this program. If not, see <https://www.gnu.org/licenses/>. *
* * * *
*******************************************************************************/ *******************************************************************************/
#pragma once
#include <stdint.h> #include <stdint.h>
#include <util/radix64.h> #include <util/radix64.h>
#include "pgpkeyutil.h" #include "pgpkeyutil.h"

2
libretroshare/src/pgp/rscertificate.cc
View File

@ -19,8 +19,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * * along with this program. If not, see <https://www.gnu.org/licenses/>. *
* * * *
*******************************************************************************/ *******************************************************************************/
#pragma once
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <stdio.h> #include <stdio.h>

1
libretroshare/src/pqi/p3cfgmgr.cc
View File

@ -25,7 +25,6 @@
#include "pqi/authssl.h" #include "pqi/authssl.h"
#include "pqi/pqibin.h" #include "pqi/pqibin.h"
#include "pqi/pqistore.h" #include "pqi/pqistore.h"
#include "pqi/pqiarchive.h"
#include <errno.h> #include <errno.h>
#include <rsserver/p3face.h> #include <rsserver/p3face.h>
#include <util/rsdiscspace.h> #include <util/rsdiscspace.h>

1
libretroshare/src/services/p3msgservice.cc
View File

@ -24,7 +24,6 @@
#include "retroshare/rsidentity.h" #include "retroshare/rsidentity.h"
#include "pqi/pqibin.h" #include "pqi/pqibin.h"
#include "pqi/pqiarchive.h"
#include "pqi/p3linkmgr.h" #include "pqi/p3linkmgr.h"
#include "pqi/authgpg.h" #include "pqi/authgpg.h"
#include "pqi/p3cfgmgr.h" #include "pqi/p3cfgmgr.h"

0
libretroshare/src/pqi/pqiarchive.cc → libretroshare/src/unused/pqiarchive.cc
View File

0
libretroshare/src/pqi/pqiarchive.h → libretroshare/src/unused/pqiarchive.h
View File

47
libretroshare/src/zeroconf/p3zcnatassist.cc
View File

@ -1,29 +1,24 @@
/* /*******************************************************************************
* libretroshare/src/zeroconf: p3zeroconf.cc * libretroshare/src/zeroconf: p3zcnatassist.cc *
* * *
* ZeroConf interface for RetroShare. * libretroshare: retroshare core library *
* * *
* Copyright 2011-2011 by Robert Fernie. * Copyright 2011-2012 by Robert Fernie <retroshare@lunamutt.com> *
* * *
* This library is free software; you can redistribute it and/or * This program is free software: you can redistribute it and/or modify *
* modify it under the terms of the GNU Library General Public * it under the terms of the GNU Lesser General Public License as *
* License Version 2 as published by the Free Software Foundation. * published by the Free Software Foundation, either version 3 of the *
* * License, or (at your option) any later version. *
* This library is distributed in the hope that it will be useful, * *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * This program is distributed in the hope that it will be useful, *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* Library General Public License for more details. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* * GNU Lesser General Public License for more details. *
* You should have received a copy of the GNU Library General Public * *
* License along with this library; if not, write to the Free Software * You should have received a copy of the GNU Lesser General Public License *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * along with this program. If not, see <https://www.gnu.org/licenses/>. *
* USA. * *
* *******************************************************************************/
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#include "zeroconf/p3zeroconf.h" #include "zeroconf/p3zeroconf.h"
#include "zeroconf/p3zcnatassist.h" #include "zeroconf/p3zcnatassist.h"

47
libretroshare/src/zeroconf/p3zcnatassist.h
View File

@ -1,29 +1,24 @@
/* /*******************************************************************************
* libretroshare/src/zeroconf: p3zcnatassist.h * libretroshare/src/zeroconf: p3zcnatassist.h *
* * *
* ZeroConf interface for RetroShare. * libretroshare: retroshare core library *
* * *
* Copyright 2011-2012 by Robert Fernie. * Copyright 2011-2012 by Robert Fernie <retroshare@lunamutt.com> *
* * *
* This library is free software; you can redistribute it and/or * This program is free software: you can redistribute it and/or modify *
* modify it under the terms of the GNU Library General Public * it under the terms of the GNU Lesser General Public License as *
* License Version 2 as published by the Free Software Foundation. * published by the Free Software Foundation, either version 3 of the *
* * License, or (at your option) any later version. *
* This library is distributed in the hope that it will be useful, * *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * This program is distributed in the hope that it will be useful, *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* Library General Public License for more details. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* * GNU Lesser General Public License for more details. *
* You should have received a copy of the GNU Library General Public * *
* License along with this library; if not, write to the Free Software * You should have received a copy of the GNU Lesser General Public License *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * along with this program. If not, see <https://www.gnu.org/licenses/>. *
* USA. * *
* *******************************************************************************/
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#ifndef MRK_P3_ZC_NAT_ASSIST_H #ifndef MRK_P3_ZC_NAT_ASSIST_H
#define MRK_P3_ZC_NAT_ASSIST_H #define MRK_P3_ZC_NAT_ASSIST_H

47
libretroshare/src/zeroconf/p3zeroconf.cc
View File

@ -1,29 +1,24 @@
/* /*******************************************************************************
* libretroshare/src/zeroconf: p3zeroconf.cc * libretroshare/src/zeroconf: p3zeroconf.cc *
* * *
* ZeroConf interface for RetroShare. * libretroshare: retroshare core library *
* * *
* Copyright 2011-2011 by Robert Fernie. * Copyright 2011-2012 by Robert Fernie <retroshare@lunamutt.com> *
* * *
* This library is free software; you can redistribute it and/or * This program is free software: you can redistribute it and/or modify *
* modify it under the terms of the GNU Library General Public * it under the terms of the GNU Lesser General Public License as *
* License Version 2 as published by the Free Software Foundation. * published by the Free Software Foundation, either version 3 of the *
* * License, or (at your option) any later version. *
* This library is distributed in the hope that it will be useful, * *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * This program is distributed in the hope that it will be useful, *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* Library General Public License for more details. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* * GNU Lesser General Public License for more details. *
* You should have received a copy of the GNU Library General Public * *
* License along with this library; if not, write to the Free Software * You should have received a copy of the GNU Lesser General Public License *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * along with this program. If not, see <https://www.gnu.org/licenses/>. *
* USA. * *
* *******************************************************************************/
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#include "zeroconf/p3zeroconf.h" #include "zeroconf/p3zeroconf.h"
#include <openssl/sha.h> #include <openssl/sha.h>
#include <iostream> #include <iostream>

47
libretroshare/src/zeroconf/p3zeroconf.h
View File

@ -1,29 +1,24 @@
/* /*******************************************************************************
* libretroshare/src/zeroconf: p3zeroconf.h * libretroshare/src/zeroconf: p3zeroconf.h *
* * *
* ZeroConf interface for RetroShare. * libretroshare: retroshare core library *
* * *
* Copyright 2011-2011 by Robert Fernie. * Copyright 2011-2012 by Robert Fernie <retroshare@lunamutt.com> *
* * *
* This library is free software; you can redistribute it and/or * This program is free software: you can redistribute it and/or modify *
* modify it under the terms of the GNU Library General Public * it under the terms of the GNU Lesser General Public License as *
* License Version 2 as published by the Free Software Foundation. * published by the Free Software Foundation, either version 3 of the *
* * License, or (at your option) any later version. *
* This library is distributed in the hope that it will be useful, * *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * This program is distributed in the hope that it will be useful, *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* Library General Public License for more details. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* * GNU Lesser General Public License for more details. *
* You should have received a copy of the GNU Library General Public * *
* License along with this library; if not, write to the Free Software * You should have received a copy of the GNU Lesser General Public License *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * along with this program. If not, see <https://www.gnu.org/licenses/>. *
* USA. * *
* *******************************************************************************/
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#ifndef MRK_P3_ZEROCONF_H #ifndef MRK_P3_ZEROCONF_H
#define MRK_P3_ZEROCONF_H #define MRK_P3_ZEROCONF_H