Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simple Service Location Protocol of 6LoWPAN implementation in TinyOS #304

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

md-jamal
Copy link
Contributor

Simple Service Location Protocol(SSLP) provides framework for the discovery and selection of services working on the 6LoWPAN.There are three types of nodes existing in SSLP:DA,UA,SA.UA(User Agent) is the node which is looking for services,SA(Service Agent) is the node which is advertising services,DA(Directory Agent) is the node which maintains the cache about the services advertised by SA and provides these services to UA when asked by him.Implementation in TinyOS has all the features

Draft Link : http://tools.ietf.org/html/draft-daniel-6lowpan-sslp-02

…Protocol(SSLP) provides framework for the discovery and selection of services working on the 6LoWPAN.There are three types of nodes existing in SSLP:DA,UA,SA.UA(User Agent) is the node which is looking for services,SA(Service Agent) is the node which is advertising services,DA(Directory Agent) is the node which maintains the cache about the services advertised by SA and provides these services to UA when asked by him.Implementation in TinyOS has all the features
@cire831
Copy link
Member

cire831 commented Aug 11, 2014

the first commit is problematic. It basically cleans up a merge conflict that shouldn't have been there to begin with.

Brad can you please check your latest round of commits and see if there are any other merge conflicts that didn't get cleaned up?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants