[Spread-cvs] commit: r668 - trunk/daemon
jschultz at spread.org
jschultz at spread.org
Tue Jan 21 18:36:16 EST 2014
Author: jschultz
Date: 2014-01-21 18:36:16 -0500 (Tue, 21 Jan 2014)
New Revision: 668
Modified:
trunk/daemon/protocol.c
Log:
Potential bugfix for getting live token from wrong transmitter
Modified: trunk/daemon/protocol.c
===================================================================
--- trunk/daemon/protocol.c 2014-01-21 23:26:55 UTC (rev 667)
+++ trunk/daemon/protocol.c 2014-01-21 23:36:16 UTC (rev 668)
@@ -509,15 +509,20 @@
goto END;
}
+ Alarmp( SPLOG_INFO | SPLOG_NODATE, PROTOCOL, "\n" );
+ Alarmp( SPLOG_INFO, PROTOCOL, "Prot_handle_token: type = 0x%08X; transmitter = 0x%08X; seq = %d; proc_id = 0x%08X; aru = %d; aru_last_id = 0x%08X;\n",
+ Token->type, Token->transmiter_id, Token->seq, Token->proc_id, Token->aru, Token->aru_last_id );
+
/* The Veto property for tokens - swallow this token */
if( ! Memb_token_alive() ) {
Alarmp( SPLOG_INFO, PROTOCOL, "Prot_handle_token: Veto Property. Memb not alive.\n" );
goto END;
}
- Alarmp( SPLOG_INFO | SPLOG_NODATE, PROTOCOL, "\n" );
- Alarmp( SPLOG_INFO, PROTOCOL, "Prot_handle_token: type = 0x%08X; transmitter = 0x%08X; seq = %d; proc_id = 0x%08X; aru = %d; aru_last_id = 0x%08X;\n",
- Token->type, Token->transmiter_id, Token->seq, Token->proc_id, Token->aru, Token->aru_last_id );
+ if ( Token->transmiter_id != (rtr_proc_id = Conf_previous( Memb_active_ptr() ) ) ) {
+ Alarmp( SPLOG_INFO, PROTOCOL, "Prot_handle_token: Received token from unexpected transmitter! Should be 0x%08X\n", rtr_proc_id );
+ goto END;
+ }
if( ret != sizeof(token_header) + Token->rtr_len )
{
More information about the Spread-cvs
mailing list