load/save of banlist comments. Removed unused menu entries. Added auto-fill of input fields on sleection

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8343 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-06-02 13:02:20 +00:00
parent 25c0dfe69e
commit 777c915be2
7 changed files with 74 additions and 26 deletions

View file

@ -141,9 +141,10 @@ BanListPeer::BanListPeer()
void BanListPeer::toRsTlvBanListEntry(RsTlvBanListEntry &e) const
{
e.addr.addr = addr;
e.level = level;
e.reason = reason;
e.masked_bytes = masked_bytes;
e.reason = reason;
e.level = level;
e.comment = comment;
e.age = time(NULL) - mTs;
}
@ -155,8 +156,8 @@ void BanListPeer::fromRsTlvBanListEntry(const RsTlvBanListEntry &e)
level = e.level; // LOCAL, FRIEND, FoF.
state = true; // true=>active, false=>just stored but inactive
connect_attempts = 0; // recorded by the BanList service
comment = e.comment; // recorded by the BanList service
mTs = time(NULL) - e.age;
comment.clear() ; //
}
static sockaddr_storage makeBitsRange(const sockaddr_storage& addr,int masked_bytes)
@ -409,6 +410,8 @@ void p3BanList::addIpRange(const sockaddr_storage &addr, int masked_bytes,uint32
std::cerr << "(EE) Cannot add IP range. Bad list_type. Should be eiter RSBANLIST_CHECKING_FLAGS_BLACKLIST or RSBANLIST_CHECKING_FLAGS_WHITELIST" << std::endl;
IndicateConfigChanged() ;
condenseBanSources_locked() ;
}
int p3BanList::tick()
@ -1026,6 +1029,7 @@ int p3BanList::sendBanSet(const RsPeerId& peerid)
RsTlvBanListEntry bi;
it->second.toRsTlvBanListEntry(bi) ;
bi.comment.clear() ; // don't send comments.
item->peerList.mList.push_back(bi);
}
}