commit c90deb1055a5caab6de0637e56bd3e2930aab372
author Yingdi Yu <yuyingdi@gmail.com> Wed Nov 06 18:51:19 2013 -0800
committer Yingdi Yu <yuyingdi@gmail.com> Wed Nov 06 18:51:19 2013 -0800
tree f2fdd15b3192307f192aff4aa02f1c9e0981fa56
parent 42372443faee8eb4d7a93a18a39450e55273a420

Remove the random component in forwarding hints

src/chatdialog.cpp

diff --git a/src/chatdialog.cpp b/src/chatdialog.cpp
index 17ec238..f56ccc0 100644
--- a/src/chatdialog.cpp
+++ b/src/chatdialog.cpp
@@ -348,10 +348,7 @@
   ndn::Ptr<const ndn::signature::Sha256WithRsa> sha256sig = boost::dynamic_pointer_cast<const ndn::signature::Sha256WithRsa> (data->getSignature());
   const ndn::Name & keyLocatorName = sha256sig->getKeyLocator().getKeyName();
   ndn::Ptr<ndn::security::IdentityCertificate> dskCertificate = m_invitationPolicyManager->getValidatedDskCertificate(keyLocatorName);
-  ndn::Name tmpPrefix(inviteePrefix);
-  ndn::Name prefix = tmpPrefix.getPrefix(tmpPrefix.size()-1);
-  m_syncPolicyManager->addChatDataRule(prefix, *dskCertificate, isIntroducer);
-  // m_syncPolicyManager->addChatDataRule(inviteePrefix, *dskCertificate, isIntroducer);
+  m_syncPolicyManager->addChatDataRule(inviteePrefix, *dskCertificate, isIntroducer);
   publishIntroCert(dskCertificate, isIntroducer);
 }
 

src/contactpanel.cpp

diff --git a/src/contactpanel.cpp b/src/contactpanel.cpp
index 361b7bd..d29fdb0 100644
--- a/src/contactpanel.cpp
+++ b/src/contactpanel.cpp
@@ -218,7 +218,6 @@
   string prefix = QString::fromStdString (originPrefix).trimmed ().toUtf8().constData();
   string randomSuffix = getRandomString();
   m_localPrefix = Name(prefix);
-  m_localPrefix.append(randomSuffix);
 }
 
 void
@@ -226,7 +225,6 @@
 { 
   string randomSuffix = getRandomString();
   m_localPrefix = Name("/private/local"); 
-  m_localPrefix.append(randomSuffix);
 }
 
 void
@@ -570,15 +568,13 @@
   _LOG_DEBUG("introducer: " << std::boolalpha << isIntroducer);
 
   Name chatroomName(chatroom.toUtf8().constData());
-  Name prefix = m_localPrefix.getPrefix(m_localPrefix.size()-1);
-  ChatDialog* chatDialog = new ChatDialog(m_contactManager, chatroomName, prefix, m_defaultIdentity, m_nickName);
-  // ChatDialog* chatDialog = new ChatDialog(m_contactManager, chatroomName, m_localPrefix, m_defaultIdentity);
+  ChatDialog* chatDialog = new ChatDialog(m_contactManager, chatroomName, m_localPrefix, m_defaultIdentity, m_nickName);
   m_chatDialogs.insert(pair <Name, ChatDialog*> (chatroomName, chatDialog));
 
   connect(chatDialog, SIGNAL(closeChatDialog(const ndn::Name&)),
           this, SLOT(removeChatDialog(const ndn::Name&)));
 
-  //TODO: send invitation
+  // send invitation
   Name inviteeNamespace(invitee.toUtf8().constData());
   Ptr<ContactItem> inviteeItem = m_contactManager->getContact(inviteeNamespace);
 
@@ -597,15 +593,11 @@
 
   Name chatroomName("/ndn/broadcast/chronos");
   chatroomName.append(invitation.getChatroom());
-  Name prefix = m_localPrefix.getPrefix(m_localPrefix.size()-1);
-  ChatDialog* chatDialog = new ChatDialog(m_contactManager, chatroomName, prefix, m_defaultIdentity, m_nickName, true);
-  // ChatDialog* chatDialog = new ChatDialog(m_contactManager, chatroomName, m_localPrefix, m_defaultIdentity);
+  ChatDialog* chatDialog = new ChatDialog(m_contactManager, chatroomName, m_localPrefix, m_defaultIdentity, m_nickName, true);
   connect(chatDialog, SIGNAL(closeChatDialog(const ndn::Name&)),
           this, SLOT(removeChatDialog(const ndn::Name&)));
 
-  Name inviterPrefix = invitation.getInviterPrefix().getPrefix(invitation.getInviterPrefix().size()-1);
-  chatDialog->addChatDataRule(inviterPrefix, identityCertificate, true);
-  // chatDialog->addChatDataRule(invitation.getInviterPrefix(), identityCertificate, true);
+  chatDialog->addChatDataRule(invitation.getInviterPrefix(), identityCertificate, true);
 
   Ptr<ContactItem> inviterItem = m_contactManager->getContact(invitation.getInviterNameSpace());
   chatDialog->addTrustAnchor(inviterItem->getSelfEndorseCertificate());