mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-13 03:22:34 -04:00
0d14351b8a
3099: libretroshare/src/tcponudp/udplayer.cc
libretroshare/src/tcponudp/udplayer.h
libretroshare/src/util/rsnet.cc
libretroshare/src/util/rsnet.h
moved operator<<(ostream&,sockaddr_in) to rsnet.h, as it is used at
different places
3100: libretroshare/src/util/rsdiscspace.cc
suppressed debug mode
3101: libretroshare/src/serialiser/rsdiscitems.cc
put correct (i.e. non conservative) size for RsDiscReply packets
3102: libretroshare/src/services/p3disc.cc
Made a pass on the code in p3disc. Corrected some bugs:
- suppressed an unwanted return in packet treatment
- prevented sending info to a peer about itself
- changed askInfoToAllPeers() such as not to discard info
from peers with NODISC flag (because we especially need
info for these)
- enabled receiving p3disc info even if p3discovery is
disabled. Indeed, disabeling p3disc is a measure of
protection, so it should limit the export of p3disc info,
not the import.
- removed test discarding info about dummy friends, because
it is useless
- don't discard info about peers that have the NODISC flag
(meaning that we especially need info for them)
- added safety check about received GPG keys. Before we
relied on this test being performed by
p3ConnMgr::addFriend()
- added some debug info
3103: libretroshare/src/ft/ftcontroller.cc
removed debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
79 lines
2.3 KiB
C++
79 lines
2.3 KiB
C++
/*
|
|
* libretroshare/src/util: rsnet.h
|
|
*
|
|
* Universal Networking Header for RetroShare.
|
|
*
|
|
* Copyright 2004-2006 by Robert Fernie.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License Version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library 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
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA.
|
|
*
|
|
* Please report all bugs and problems to "retroshare@lunamutt.com".
|
|
*
|
|
*/
|
|
|
|
#ifndef RS_UNIVERSAL_NETWORK_HEADER
|
|
#define RS_UNIVERSAL_NETWORK_HEADER
|
|
|
|
#include <inttypes.h>
|
|
#include <stdlib.h> /* Included because GCC4.4 wants it */
|
|
#include <string.h> /* Included because GCC4.4 wants it */
|
|
#include <iostream>
|
|
|
|
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
|
#ifndef WINDOWS_SYS
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
|
|
#else
|
|
|
|
#include "util/rswin.h"
|
|
|
|
#include <winsock2.h>
|
|
#include <ws2tcpip.h>
|
|
|
|
#include <stdio.h> /* for ssize_t */
|
|
//typedef uint32_t socklen_t;
|
|
typedef uint32_t in_addr_t;
|
|
|
|
int inet_aton(const char *name, struct in_addr *addr);
|
|
|
|
#endif
|
|
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
|
|
|
/* 64 bit conversions */
|
|
uint64_t ntohll(uint64_t x);
|
|
uint64_t htonll(uint64_t x);
|
|
|
|
/* blank a network address */
|
|
void sockaddr_clear(struct sockaddr_in *addr);
|
|
|
|
/* determine network type (moved from pqi/pqinetwork.cc) */
|
|
bool isValidNet(const struct in_addr *addr);
|
|
bool isLoopbackNet(const struct in_addr *addr);
|
|
bool isPrivateNet(const struct in_addr *addr);
|
|
bool isExternalNet(const struct in_addr *addr);
|
|
|
|
/* convert addresses */
|
|
bool getIPAddressFromString (const char *addr_str, struct in_addr *addr);
|
|
|
|
std::ostream& operator<<(std::ostream& o,const struct sockaddr_in&) ;
|
|
|
|
#endif /* RS_UNIVERSAL_NETWORK_HEADER */
|