izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Factor encrypt/decrypt out of Network::Message.

Browse Source
This commit is contained in:
John Hood
2016-02-26 12:25:22 -05:00
parent 6abd4739de
commit 255dc39c9f
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/network.cc
+5 -5
View File
@@ -66,7 +66,7 @@ using namespace Crypto;
const uint64_t DIRECTION_MASK = uint64_t(1) << 63;
const uint64_t SEQUENCE_MASK = uint64_t(-1) ^ DIRECTION_MASK;
/* Read in packet from coded string */
/* Read in packet */
Packet::Packet( const Message & message )
: seq( message.nonce.val() & SEQUENCE_MASK ),
direction( (message.nonce.val() & DIRECTION_MASK) ? TO_CLIENT : TO_SERVER ),
@@ -83,8 +83,8 @@ Packet::Packet( const Message & message )
payload = string( message.text.begin() + 2 * sizeof( uint16_t ), message.text.end() );
}
/* Output coded string from packet */
string Packet::tostring( Session *session )
/* Output from packet */
Message Packet::toMessage( void )
{
uint64_t direction_seq = (uint64_t( direction == TO_CLIENT ) << 63) | (seq & SEQUENCE_MASK);
@@ -93,7 +93,7 @@ string Packet::tostring( Session *session )
string timestamps = string( (char *)ts_net, 2 * sizeof( uint16_t ) );
return session->encrypt( Message( Nonce( direction_seq ), timestamps + payload ) );
return Message( Nonce( direction_seq ), timestamps + payload );
}
Packet Connection::new_packet( const string &s_payload )
@@ -399,7 +399,7 @@ void Connection::send( const string & s )
Packet px = new_packet( s );
string p = px.tostring( &session );
string p = session.encrypt( px.toMessage() );
ssize_t bytes_sent = sendto( sock(), p.data(), p.size(), MSG_DONTWAIT,
&remote_addr.sa, remote_addr_len );
src/network/network.h
+1 -1
View File
@@ -89,7 +89,7 @@ namespace Network {
Packet( const Message & message );
string tostring( Session *session );
Message toMessage( void );
};
union Addr {