Skip to content

Interact, a basic working version.#4

Merged
KrishnanSG merged 47 commits intomasterfrom
networking
Oct 21, 2019
Merged

Interact, a basic working version.#4
KrishnanSG merged 47 commits intomasterfrom
networking

Conversation

@SivagiriVisakan
Copy link
Collaborator

@SivagiriVisakan SivagiriVisakan commented Oct 21, 2019

This PR essentially brings the changes from the dev branch to the master branch.
There is a basic working version of file synchronization.

One server starts the other user joins using the IP address of the first one.

KrishnanSG and others added 30 commits September 24, 2019 21:00
@KrishnanSG
Inital version of Server and Client using threading
ea7bb34
@KrishnanSG
Add threading and implement P2P
d4203ae
@KrishnanSG
Add gitignore to networking
8b9072d
@KrishnanSG
MurMur Hash func .py file
387a5f1
@KrishnanSG
Add command line arg for filename.
dfa9960 
Add documentation for code.
@KrishnanSG
Modify BF based on freq algorithm
103d64c
@KrishnanSG
Implement function to send and read BF
8bcecac
@KrishnanSG
Clean Code and pass filename for readBF as parameter
37c90a6
@SivagiriVisakan
Ignore venv from git.
d446bd8
@SivagiriVisakan
Add requirements.txt to track dependencies.
1c15d9e
@SivagiriVisakan
Use argparse for cli and usewatchdog to watch for changes in the spec…
79ae0e5 
…ified file.
@KrishnanSG
Fix collisions by hashing again based on freq
5b6aa58
@KrishnanSG
Fix filepath in readBloomFilter func
662dfd2
@KrishnanSG
Implemented using Class - Not completed
c7b88e5
@KrishnanSG
Message Format
ea166c1
@SivagiriVisakan
Make the code in NetworkManager a bit more generic.
62f0317 
Example of how to listen to data is given in the last part of Server.py
@SivagiriVisakan
Use the NetworkManager class to exchange data.
bc006ea 
Make the watchdog observer a class object to implement logic avoid duplicate calls.
@SivagiriVisakan
BloomFilter: Return the bloom filter as the string directly in bytes.
01bc4c8
@SivagiriVisakan
Exchange the bloom filters properly when a file is modified.
973ebe4
@KrishnanSG
Add inverse function to get n from size
358c41c 
Add  readBFFromBtyes
@KrishnanSG
Add desc abt networking steps
499fd57
@KrishnanSG
File merge v0.5
77f848e
@KrishnanSG
Synchronizer v1.0
09e6d25 
Rename FileMerge to Synchronizer
@KrishnanSG
Add getMissingContent and minor changes
de64609
@KrishnanSG
Modify getMissingContent to get input as bytes
4e23ecf 
Add getNfromSize func to get N give size of BF
@SivagiriVisakan
Use Request to abstract a request for processing and use RequestHandl…
75b962c 
…er class for handling incoming requests.
@SivagiriVisakan
BloomFilter: Split the contents into a list when reading from bytes.
9e2f9a6
@SivagiriVisakan
utils/Request: Implement the get_message_size function.
8aacc92
@SivagiriVisakan
main.py: Sync file when the actual lines are received.
f07f5cf 
This isn't working completely as expected yet, as this triggers an infinite loop and the contents keep getting exchanged between the two files.
@SivagiriVisakan
main.py: Wait a second after syncing and before changing the state to…
30a2b97 
… avoid infinite loop.
SivagiriVisakan and others added 16 commits October 13, 2019 18:17
@SivagiriVisakan
main.py: Store the computed missing content in a global variable.
58828a6
@SivagiriVisakan
Remove some unused code.
49f6e3a
@SivagiriVisakan
main.py: Clean up code.
945c42b
@SivagiriVisakan
main.py: Rename sendBloomFilter to computeBloomFilter.
4f76f14
@SivagiriVisakan
main.py: Extract the code to intialize the sync into a seperate funct…
b080d38 
…ion.
@SivagiriVisakan
Sync the files initially as soon as the connection succeeds.
1fdff22
@SivagiriVisakan
P2P/Server: Remove unused code and change the max data that can be re…
d520669 
…ceived in a request.
@SivagiriVisakan
Remove DEBUG print message.
52941f8
@SivagiriVisakan
Modify print messages.
fbeada2
@KrishnanSG
Fix bug during update and delete
c439cee 
Cause: Didn't include freq parameter during validate func
@KrishnanSG
Modify delete func, used pop instead of remove
648ea8e
@KrishnanSG
Add computeHash
54f56a9
@KrishnanSG
Fix major bug casued by deletion.
606ff70 
Cause: Line number wasn't updated.
@SivagiriVisakan
Remove unused Client.py
21a2d74
@SivagiriVisakan
Verify the file is synced properly by checking hash value, if not the…
7f92a85 
…n fix it.

If the hash values differ, then we have to send the entire file to keep
both the files in sync with each other.

Closes #3
@SivagiriVisakan
P2P: Handle abrupt connection closes and give "nice" messages.
f5a86d9 
This can happen, for example when a peer presses CTRL+C.

This makes the program crash for the other user, but now we catch those
exception print "nice" (relatively nice :D) error messages.

Closes #1
KrishnanSG
KrishnanSG approved these changes Oct 21, 2019
View reviewed changes
Copy link
Owner

@KrishnanSG KrishnanSG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interact v1.0

@KrishnanSG KrishnanSG merged commit 653dad2 into master Oct 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@KrishnanSG KrishnanSG KrishnanSG approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@SivagiriVisakan @KrishnanSG