every parts are wroking, implemented ndnsd-tool completly and also th… by dulalsaurab · Pull Request #2 · dulalsaurab/NDNSD

dulalsaurab · 2020-05-27T02:06:21Z

…e modified the callbacks

agawande · 2020-05-31T17:49:40Z

ndnsd/discovery/service-discovery.cpp

+    // send back the response
+    static const std::string content("Update Successful");
+    // Create Data packet
+    auto data = make_shared<ndn::Data>(interest.getName());


shared_ptr is not needed here.

agawande · 2020-05-31T17:50:47Z

ndnsd/discovery/service-discovery.cpp

+
+  auto dataContent = makeDataContent();
+  auto& data = wireEncode(dataContent, status);
+  replyData->setContent(data);


Combine:
replyData->setContent(wireEncode(makeDataContent(), status));

agawande · 2020-05-31T17:51:07Z

ndnsd/discovery/service-discovery.cpp

+  auto status = (timeDiff >= m_producerState.serviceLifetime*1000)
+                          ? EXPIRED : ACTIVE;
+
+  std::shared_ptr<ndn::Data> replyData = std::make_shared<ndn::Data>(name);


No need for shared_ptr

agawande · 2020-05-31T17:51:37Z

ndnsd/discovery/service-discovery.cpp

+  replyData->setContent(data);
+  m_keyChain.sign(*replyData);
+
+  try


Remove try catch -have try catch on processEvents for failure of face.

agawande · 2020-05-31T17:52:37Z

ndnsd/discovery/service-discovery.cpp

+  // reset the wire first
+  if(m_wire.hasWire())
+    m_wire.reset();
+  // |service-name|<applicationPrefix>|<key>|<val>|<key>|<val>|...and so on


And so on:
|service-name||(||)*

agawande · 2020-05-31T17:52:52Z

ndnsd/discovery/service-discovery.cpp

+                         bind(&ServiceDiscovery::onData, this, _1, _2),
+                         bind(&ServiceDiscovery::onTimeout, this, _1),
+                         bind(&ServiceDiscovery::onTimeout, this, _1));
+


Extra line.

agawande · 2020-05-31T17:54:33Z

ndnsd/discovery/service-discovery.cpp

+
+template<ndn::encoding::Tag TAG>
+size_t
+ServiceDiscovery::wireEncode(ndn::EncodingImpl<TAG>& encoder,


Never seen a wireEncode like this. Usually info and status comes from a class member.
If this is the case then you are right, in this program having m_wire as a class member does not make sense either.

Yes, this wireEncode is a bit weird. I kept m_wire member variable because I need to return wire from a wireEncode. If wire is not a member variable, it will throw "a reference to stack memory associated with local variable 'wire' returned". So, either I have to dynamically allocate memory for "wire" or pass wire to wireEncode from callee, and I don't like both of these solutions.

What do you suggest?

agawande · 2020-05-31T17:55:45Z

ndnsd/discovery/service-discovery.hpp

+   @brief Process flags send by consumer and producer application.
+  */
+  uint8_t
+  processFalgs(const std::map<char, uint8_t>& flags, const char type);


agawande · 2020-05-31T17:56:18Z

wscript

-Copyright (c) 2014-2019,  The University of Memphis,
-                          Regents of the University of California,
-                          Arizona Board of Regents.
+Copyright (c) 2014-2019,  The University of Memphis


Copyright year

agawande · 2020-05-31T17:56:34Z

wscript

-                          Arizona Board of Regents.
+Copyright (c) 2014-2019,  The University of Memphis

 This file is part of NLSR (Named-data Link State Routing).


Perhaps not true.

agawande

Overall seems okay to me. Some confusion in ServiceDiscovery wireEncode/Decode.
Don't forget to push to appropriate branch your changes (so I am able to see diff here).

…e modified the callbacks

agawande · 2020-06-04T04:05:19Z

examples/consumer.cpp

+  std::string serviceName;
+  int contFlag = -1;
+
+  namespace po = boost::program_options;


Why use boost::program_options here instead of just usual c++?

agawande · 2020-06-04T04:06:58Z

examples/consumer.cpp

+
+  try
+  {
+    std::cout << "Fetching service info for: " << serviceName << std::endl;


agawande · 2020-06-04T04:07:39Z

examples/consumer.cpp

+    usage(visibleOptDesc);
+  }
+  // TODO: protocol shouldn't be hard-coded.
  std::map<char, uint8_t> flags;


What I meant was to replay this std::map with an options class such that you pass that to your discovery stuff. Where are the new changes?

agawande · 2020-06-04T04:08:52Z

examples/producer.cpp

 {
  std::map<char, uint8_t> flags;
-  flags.insert(std::pair<char, uint8_t>('p', ndnsd::SYNC_PROTOCOL_CHRONOSYNC)); //protocol choice
+  flags.insert(std::pair<char, uint8_t>('p', ndnsd::SYNC_PROTOCOL_PSYNC)); //protocol choice


still hard coded protocol choice?

agawande · 2020-06-04T04:09:27Z

ndnsd/discovery/file-processor.cpp


 #include "file-processor.hpp"

+#include<iostream>


Space before <

agawande · 2020-06-04T04:09:40Z

examples/producer.cpp

 #include "ndnsd/discovery/service-discovery.hpp"
+#include <ndn-cxx/util/logger.hpp>
+
+#include<iostream>


Space before <

agawande · 2020-06-04T04:10:14Z

examples/producer.cpp

+#include <ndn-cxx/util/logger.hpp>
+
+#include<iostream>
 #include <list>


Where is list used?

agawande · 2020-06-04T04:13:02Z

ndnsd/discovery/service-discovery.cpp

+    // if change is detected, call doUpdate to notify sync about the update
+    doUpdate(m_producerState.applicationPrefix);
    // send back the response
    static const std::string content("Update Successful");


On second thoughts, just send an empty data here. Why even set a content?

agawande · 2020-06-04T04:13:56Z

ndnsd/discovery/service-discovery.cpp

-  catch (const std::exception& ex) {
-    std::cerr << ex.what() << std::endl;
-  }
+  auto dataContent = makeDataContent();


Perhaps move the content of makeDataContent to wireEncode?

So that you can remove arguments from wireEncode and get the status and make the content within it. Simpliyfing this function.
Also if status and data has not changed then the old m_wire should suffice.
So probably status can be a member of the class.

yes, this can be done.

agawande · 2020-06-04T04:22:48Z

ndnsd/discovery/service-discovery.cpp

@@ -343,8 +370,8 @@ ServiceDiscovery::wireDecode(const ndn::Block& wire)



If this wireDecode function just returns the consumerReply it has nothing to do with this class. Make it a free/static function. Why are you saving the m_wire - what do you gain out of it? You are not initializing any other class members...
I guess question is how is this wireDecode used? As far as I can tell it is static.

I have made wireDecode static for now. It can be static as long as we find a better use case.

agawande · 2020-06-04T04:23:24Z

ndnsd/discovery/service-discovery.hpp

  uint8_t m_counter;

  uint32_t m_syncProtocol;
+  uint32_t m_continuousDiscovery;


What does this mean?

Its a flag specific to a consumer application, if set, will not kill consumer application after fetching service info and so consumer will keep listening for future updates.

agawande · 2020-06-04T04:24:10Z

test.info

  serviceName printer
  appPrefix /printer2/service-info
-  lifetime 100
+  lifetime 20


Probably comment is required whether seconds, ms?
Also have a test.info.sample and don't modify that file in commits.

agawande

Need to address how wireDecode is used.
Usual way is to have something like this to initialize a class and not return a class:
MyClass(Block block)
: wireDecode(block)

dulalsaurab and others added 30 commits March 30, 2020 00:04

waf working fine

b02ecf0

build fine, compilation fails

1ba7c94

Update consumer.cpp

0303200

compilation and installation working

7c3ef04

producer receiving interest

a3582bd

stuck on app crashing

3b4d0ba

fix app crashing, data was not signed

dd62698

basic producer consumer working fine

3180bc4

working on tlv

aede771

tlv working fine

0f53005

some problem with tlv

b1747aa

tlv working fine, chronosync not

cd5c9cb

chronosync stil not working

d00eef9

latest code:

73a74d3

commit with seperate producer and consumer API

77380a6

discovery flow diagram

4554ddb

Update service_discovery.drawio

26a8ab2

Create sequence_diagram_big.uml

60fb747

Create seq_diagram_small.uml

8c6f79a

added sequence diagram

7f76944

Added Directory Service.drawio

91fb52a

code clealing

0db4156

Merge branch 'master' of https://github.com/dulalsaurab/NDN-SD

58143fe

Update service_discovery.drawio

f24d81f

remove the deamon part

99862fc

final commit

b7e80b0

revised

18562a7

revised

36e8e75

added some more figures

442a5e5

added data hierarchy and edited previous diagrams

77ebb31

agawande reviewed May 31, 2020

View reviewed changes

dulalsaurab and others added 6 commits June 2, 2020 21:42

add option class

b8588c2

every parts are wroking, implemented ndnsd-tool completly and also th…

3a9b494

…e modified the callbacks

code refactor

818c485

Merge branch 'local' of https://github.com/dulalsaurab/NDN-SD into local

1a9790b

code refactor

40e9faa

Create README.md

8cc9bd6

agawande reviewed Jun 4, 2020

View reviewed changes

ndnsd/discovery/file-processor.cpp

#include "file-processor.hpp"

#include<iostream>

Copy link

Collaborator

agawande Jun 4, 2020

Choose a reason for hiding this comment

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

Space before <

agawande reviewed Jun 4, 2020

View reviewed changes

examples/producer.cpp

#include <ndn-cxx/util/logger.hpp>

#include<iostream>

#include <list>

Copy link

Collaborator

agawande Jun 4, 2020

Choose a reason for hiding this comment

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

Where is list used?

agawande reviewed Jun 4, 2020

View reviewed changes

		@@ -343,8 +370,8 @@ ServiceDiscovery::wireDecode(const ndn::Block& wire)

Conversation

dulalsaurab commented May 27, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dulalsaurab Jun 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

agawande left a comment

Choose a reason for hiding this comment

Uh oh!

agawande Jun 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

agawande Jun 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

agawande Jun 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dulalsaurab Jun 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

agawande left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

dulalsaurab Jun 3, 2020 •

edited

Loading

agawande Jun 4, 2020 •

edited

Loading

agawande Jun 4, 2020 •

edited

Loading

agawande Jun 4, 2020 •

edited

Loading

dulalsaurab Jun 4, 2020 •

edited

Loading

agawande left a comment •

edited

Loading