Add Rids Synchronization #459
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vikman90
force-pushed
the
master
branch
3 times, most recently
from
f6871c4 to
5fb02b1
Compare
vikman90
requested changes
Mar 23, 2018
src/os_crypto/shared/msgs.c
Outdated
| @@ -90,6 +92,7 @@ void OS_StartCounter(keystore *keys) | |||
| } | |||
|
|
|||
| keys->keyentries[i]->fp = fopen(rids_file, "r+"); | |||
| keys->keyentries[i]->inode = File_Inode(rids_file); | |||
|
|
|||
| /* If nothing is there, try to open as write only */ | |||
| if (!keys->keyentries[i]->fp) { | |||
There was a problem hiding this comment.
Missing File_Inode() here, if fopen() failed. This call may be better after ending the if block (just like you did in ReloadCounter().
src/os_crypto/shared/msgs.c
Outdated
| } | ||
|
|
||
| /* Reload the global and local count of events */ | ||
| static void ReloadCounter(const keystore *keys, int id, const char * cid) |
There was a problem hiding this comment.
This function does not update global_count or local_count. Those variables must be updated instead of the agent counters in the case that id==keysize.
src/os_crypto/shared/msgs.c
Outdated
| @@ -315,6 +356,7 @@ char *ReadSecMSG(keystore *keys, char *buffer, char *cleartext, int id, unsigned | |||
| keys->keyentries[id]->local = msg_local; | |||
|
|
|||
| if (rcv_count >= _s_recv_flush) { | |||
| ReloadCounter(keys, id, keys->keyentries[id]->id); | |||
There was a problem hiding this comment.
The agent counter must be updated before comparing the message counter.
src/os_crypto/shared/msgs.c
Outdated
| @@ -462,6 +504,10 @@ size_t CreateSecMSG(const keystore *keys, const char *msg, size_t msg_length, ch | |||
| _finmsg[OS_MAXSTR + 1] = '\0'; | |||
| msg_encrypted[OS_MAXSTR] = '\0'; | |||
|
|
|||
| if (snd_count >= _s_recv_flush) { | |||
| ReloadCounter(keys, keys->keysize, SENDER_COUNTER); | |||
There was a problem hiding this comment.
This call must update global_counter and local_counter.
vikman90
approved these changes
Mar 23, 2018
|
GJ @bah07 !! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR add feature related issue #456
ino_t inodeto store each agent's counter inodeReloadCounterfunction checks if the inode of the file has changed, if so, reloads the corresponding counters.