Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-26 17:19:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix time_t serialization issue

Browse Source 
On 32-bit MinGW-w64, time_t is int32_t.  The existing code was serializing
time_t directly and implicitly assuming that time_t is int64_t.  This commit
formalizes that assumption by serializing int64_t directly and casting to
time_t where appropriate.

Thanks go to greatwolf for reporting this issue.

monero-project/bitmonero#88
This commit is contained in:
Zachary Michaels 2014-08-20 11:57:29 -04:00 committed by Riccardo Spagni
parent ed41ee4c26
commit 9db881864d
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p2p/net_node.inl
View File

@ -624,7 +624,9 @@ namespace nodetool
peerlist_entry pe_local = AUTO_VAL_INIT(pe_local); peerlist_entry pe_local = AUTO_VAL_INIT(pe_local);
pe_local.adr = na; pe_local.adr = na;
pe_local.id = pi; pe_local.id = pi;
time(&pe_local.last_seen); time_t last_seen;
time(&last_seen);
pe_local.last_seen = static_cast<int64_t>(last_seen);
m_peerlist.append_with_peer_white(pe_local); m_peerlist.append_with_peer_white(pe_local);
//update last seen and push it to peerlist manager //update last seen and push it to peerlist manager
@ -1102,7 +1104,9 @@ namespace nodetool
peerlist_entry pe; peerlist_entry pe;
pe.adr.ip = context.m_remote_ip; pe.adr.ip = context.m_remote_ip;
pe.adr.port = port_l; pe.adr.port = port_l;
time(&pe.last_seen); time_t last_seen;
time(&last_seen);
pe.last_seen = static_cast<int64_t>(last_seen);
pe.id = peer_id_l; pe.id = peer_id_l;
this->m_peerlist.append_with_peer_white(pe); this->m_peerlist.append_with_peer_white(pe);
LOG_PRINT_CCONTEXT_L2("PING SUCCESS " << epee::string_tools::get_ip_string_from_int32(context.m_remote_ip) << ":" << port_l); LOG_PRINT_CCONTEXT_L2("PING SUCCESS " << epee::string_tools::get_ip_string_from_int32(context.m_remote_ip) << ":" << port_l);

4
src/p2p/net_peerlist.h
View File

@ -128,7 +128,7 @@ namespace nodetool
// access by peerlist_entry::net_adress // access by peerlist_entry::net_adress
boost::multi_index::ordered_unique<boost::multi_index::tag<by_addr>, boost::multi_index::member<peerlist_entry,net_address,&peerlist_entry::adr> >, boost::multi_index::ordered_unique<boost::multi_index::tag<by_addr>, boost::multi_index::member<peerlist_entry,net_address,&peerlist_entry::adr> >,
// sort by peerlist_entry::last_seen< // sort by peerlist_entry::last_seen<
boost::multi_index::ordered_non_unique<boost::multi_index::tag<by_time>, boost::multi_index::member<peerlist_entry,time_t,&peerlist_entry::last_seen> > boost::multi_index::ordered_non_unique<boost::multi_index::tag<by_time>, boost::multi_index::member<peerlist_entry,int64_t,&peerlist_entry::last_seen> >
> >
> peers_indexed; > peers_indexed;
@ -140,7 +140,7 @@ namespace nodetool
// access by peerlist_entry::net_adress // access by peerlist_entry::net_adress
boost::multi_index::ordered_unique<boost::multi_index::tag<by_addr>, boost::multi_index::member<peerlist_entry,net_address,&peerlist_entry::adr> >, boost::multi_index::ordered_unique<boost::multi_index::tag<by_addr>, boost::multi_index::member<peerlist_entry,net_address,&peerlist_entry::adr> >,
// sort by peerlist_entry::last_seen< // sort by peerlist_entry::last_seen<
boost::multi_index::ordered_non_unique<boost::multi_index::tag<by_time>, boost::multi_index::member<peerlist_entry,time_t,&peerlist_entry::last_seen> > boost::multi_index::ordered_non_unique<boost::multi_index::tag<by_time>, boost::multi_index::member<peerlist_entry,int64_t,&peerlist_entry::last_seen> >
> >
> peers_indexed_old; > peers_indexed_old;
public: public:

2
src/p2p/p2p_protocol_defs.h
View File

@ -53,7 +53,7 @@ namespace nodetool
{ {
net_address adr; net_address adr;
peerid_type id; peerid_type id;
time_t last_seen; int64_t last_seen;
}; };
struct connection_entry struct connection_entry