projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.1.9
[fms.git]
/
src
/
freenet
/
fcpv2.cpp
diff --git
a/src/freenet/fcpv2.cpp
b/src/freenet/fcpv2.cpp
index
42995f4
..
81d706c
100644
(file)
--- a/
src/freenet/fcpv2.cpp
+++ b/
src/freenet/fcpv2.cpp
@@
-66,7
+66,7
@@
const bool FCPv2::Connect(const char *host, const int port)
struct sockaddr_storage m_serveraddr;
\r
\r
std::ostringstream portstring;
\r
struct sockaddr_storage m_serveraddr;
\r
\r
std::ostringstream portstring;
\r
- addrinfo hint,*result;
\r
+ addrinfo hint,*result
,*current
;
\r
result=NULL;
\r
portstring << port;
\r
\r
result=NULL;
\r
portstring << port;
\r
\r
@@
-80,16
+80,19
@@
const bool FCPv2::Connect(const char *host, const int port)
\r
if(result)
\r
{
\r
\r
if(result)
\r
{
\r
- memset(&m_serveraddr,0,sizeof(struct sockaddr_storage));
\r
+ for(current=result; current!=NULL && m_serversocket==-1; current=current->ai_next)
\r
+ {
\r
+ memset(&m_serveraddr,0,sizeof(struct sockaddr_storage));
\r
\r
\r
-
m_serversocket=socket(result->ai_family,result->ai_socktype,resul
t->ai_protocol);
\r
+
m_serversocket=socket(current->ai_family,current->ai_socktype,curren
t->ai_protocol);
\r
\r
\r
- if(m_serversocket!=-1)
\r
- {
\r
- rval=connect(m_serversocket,result->ai_addr,result->ai_addrlen);
\r
- if(rval==-1)
\r
+ if(m_serversocket!=-1)
\r
{
\r
{
\r
- Disconnect();
\r
+ rval=connect(m_serversocket,current->ai_addr,current->ai_addrlen);
\r
+ if(rval==-1)
\r
+ {
\r
+ Disconnect();
\r
+ }
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-124,7
+127,7
@@
const bool FCPv2::Disconnect()
int FCPv2::FindOnReceiveBuffer(const char *text)
\r
{
\r
bool found;
\r
int FCPv2::FindOnReceiveBuffer(const char *text)
\r
{
\r
bool found;
\r
-
int
i,j;
\r
+
std::vector<char>::size_type
i,j;
\r
size_t tlen=strlen(text);
\r
\r
if(m_receivebuffer.size()>=tlen)
\r
size_t tlen=strlen(text);
\r
\r
if(m_receivebuffer.size()>=tlen)
\r
@@
-289,9
+292,9
@@
const int FCPv2::SendMessage(const char *messagename, const int fieldcount, ...)
va_list args;
\r
const char *field;
\r
const char *val;
\r
va_list args;
\r
const char *field;
\r
const char *val;
\r
-
int
bytecount=0;
\r
+
std::vector<char>::size_type
bytecount=0;
\r
int i;
\r
int i;
\r
-
int
startlen;
\r
+
std::vector<char>::size_type
startlen;
\r
\r
startlen=m_sendbuffer.size();
\r
\r
\r
startlen=m_sendbuffer.size();
\r
\r
@@
-322,8
+325,8
@@
const int FCPv2::SendMessage(const char *messagename, const int fieldcount, ...)
\r
const int FCPv2::SendMessage(FCPMessage &message)
\r
{
\r
\r
const int FCPv2::SendMessage(FCPMessage &message)
\r
{
\r
-
int
bytecount=0;
\r
-
int
startlen;
\r
+
std::vector<char>::size_type
bytecount=0;
\r
+
std::vector<char>::size_type
startlen;
\r
FCPMessage::iterator i;
\r
\r
startlen=m_sendbuffer.size();
\r
FCPMessage::iterator i;
\r
\r
startlen=m_sendbuffer.size();
\r