dprintf("%s #%u sent %ib %s:%x\n",
tintstr(),id_,(int)evbuffer_get_length(evb),peer().str(),
peer_channel_id_);
- int r = SendTo(socket_,peer(),evb);
+ int r = SendTo(socket_,peer(),&evb);
if (r==-1)
print_error("can't send datagram");
else
dprintf("%s #%u fsent %ib %s:%x\n",
tintstr(),id_,(int)evbuffer_get_length(evb),peer().str(),
peer_channel_id_);
- int ret = Channel::SendTo(socket_,peer(),evb); // kind of fragmentation
+ int ret = Channel::SendTo(socket_,peer(),&evb); // kind of fragmentation
if (ret > 0)
raw_bytes_up_ += ret;
evbuffer_add_32be(evb, peer_channel_id_);
int i = 0;
for (; i<addr.addr->count; ++i) {
struct evbuffer *evb = pevb[i];
+ Address fromi;
+ fromi.addr->dests[0].addr = addr.addr->dests[i].addr;
+ fromi.addr->dests[0].port = addr.addr->dests[i].port;
size_t evboriglen = evbuffer_get_length(evb);
#define return_log(...) { fprintf(stderr,__VA_ARGS__); evbuffer_free(evb); return; }
if (evbuffer_get_length(evb)<4)
- return_log("socket layer weird: datagram shorter than 4 bytes from %s (prob ICMP unreach)\n",addr.str());
+ return_log("socket layer weird: datagram shorter than 4 bytes from %s (prob ICMP unreach)\n",fromi.str());
uint32_t mych = evbuffer_remove_32be(evb);
Sha1Hash hash;
Channel* channel = NULL;
if (mych==0) { // peer initiates handshake
if (evbuffer_get_length(evb)<1+4+1+4+Sha1Hash::SIZE)
return_log ("%s #0 incorrect size %i initial handshake packet %s\n",
- tintstr(),(int)evbuffer_get_length(evb),addr.str());
+ tintstr(),(int)evbuffer_get_length(evb),fromi.str());
uint8_t hashid = evbuffer_remove_8(evb);
if (hashid!=SWIFT_HASH)
return_log ("%s #0 no hash in the initial handshake %s\n",
- tintstr(),addr.str());
+ tintstr(),fromi.str());
bin_t pos = bin_fromUInt32(evbuffer_remove_32be(evb));
if (!pos.is_all())
- return_log ("%s #0 that is not the root hash %s\n",tintstr(),addr.str());
+ return_log ("%s #0 that is not the root hash %s\n",tintstr(),fromi.str());
hash = evbuffer_remove_hash(evb);
FileTransfer* ft = FileTransfer::Find(hash);
if (!ft)
- return_log ("%s #0 hash %s unknown, requested by %s\n",tintstr(),hash.hex().c_str(),addr.str());
+ return_log ("%s #0 hash %s unknown, requested by %s\n",tintstr(),hash.hex().c_str(),fromi.str());
dprintf("%s #0 -hash ALL %s\n",tintstr(),hash.hex().c_str());
// Arno, 2012-02-27: Check for duplicate channel
- Channel* existchannel = ft->FindChannel(addr,NULL);
+ Channel* existchannel = ft->FindChannel(fromi,NULL);
if (existchannel)
{
// Arno: 2011-10-13: Ignore if established, otherwise consider
// attempt is to new channel or to existing. Currently read
// in OnHandshake()
//
- return_log("%s #0 have a channel already to %s\n",tintstr(),addr.str());
+ return_log("%s #0 have a channel already to %s\n",tintstr(),fromi.str());
} else {
channel = existchannel;
//fprintf(stderr,"Channel::RecvDatagram: HANDSHAKE: reuse channel %s\n", channel->peer_.str() );
}
if (channel == NULL) {
//fprintf(stderr,"Channel::RecvDatagram: HANDSHAKE: create new channel %s\n", addr.str() );
- channel = new Channel(ft, socket, addr);
+ channel = new Channel(ft, socket, fromi);
}
//fprintf(stderr,"CHANNEL INCOMING DEF hass %s is id %d\n",hash.hex().c_str(),channel->id());
} else { // peer responds to my handshake (and other messages)
mych = DecodeID(mych);
if (mych>=channels.size())
- return_log("%s invalid channel #%u, %s\n",tintstr(),mych,addr.str());
+ return_log("%s invalid channel #%u, %s\n",tintstr(),mych,fromi.str());
channel = channels[mych];
if (!channel)
return_log ("%s #%u is already closed\n",tintstr(),mych);
- if (channel->IsDiffSenderOrDuplicate(addr,mych)) {
+ if (channel->IsDiffSenderOrDuplicate(fromi,mych)) {
channel->Schedule4Close();
return;
}
//dprintf("recvd %i bytes for %i\n",data.size(),channel->id);
bool wasestablished = channel->is_established();
- dprintf("%s #%u peer %s recv_peer %s addr %s\n", tintstr(),mych, channel->peer().str(), channel->recv_peer().str(), addr.str() );
+ dprintf("%s #%u peer %s recv_peer %s addr %s\n", tintstr(),mych, channel->peer().str(), channel->recv_peer().str(), fromi.str() );
channel->Recv(evb);