summaryrefslogtreecommitdiff
path: root/draft-schanzen-r5n.xml
diff options
context:
space:
mode:
Diffstat (limited to 'draft-schanzen-r5n.xml')
-rw-r--r--draft-schanzen-r5n.xml47
1 files changed, 26 insertions, 21 deletions
diff --git a/draft-schanzen-r5n.xml b/draft-schanzen-r5n.xml
index ac44aa0..f8c1294 100644
--- a/draft-schanzen-r5n.xml
+++ b/draft-schanzen-r5n.xml
@@ -653,8 +653,8 @@ END
653 <section anchor="p2p_put_processing"> 653 <section anchor="p2p_put_processing">
654 <name>Processing</name> 654 <name>Processing</name>
655 <t> 655 <t>
656 Upon receiving a PUT message from a connected peer. An implementation 656 Upon receiving a <tt>PutMessage</tt> from a connected peer.
657 MUST process it step by step as follows: 657 An implementation MUST process it step by step as follows:
658 </t> 658 </t>
659 <ol> 659 <ol>
660 <li> 660 <li>
@@ -667,23 +667,23 @@ END
667 Else, the block MUST be validated as defined in (3). 667 Else, the block MUST be validated as defined in (3).
668 </li> 668 </li>
669 <li> 669 <li>
670 The block key is extracted from BLOCK. If the block key 670 The block payload of the message is evaluated using according
671 does not match KEY or cannot be extracted because the BLOCK 671 to the BTYPE using the respective <tt>ValidateBlockStoreRequest</tt>
672 is malformed, the message MUST be discarded. 672 procedure.
673 The block is evaluated. TODO FIXME: In the code, we do not really 673 If the block payload is invalid or does not match the key,
674 do this. We should review. 674 it MUST be discarded.
675 </li> 675 </li>
676 <li> 676 <li>
677 The sender peer ID SHOULD be in the BLOOMFILTER. If not, the 677 The sender peer ID SHOULD be in the BLOOMFILTER. If not, the
678 implementation MAY log an error, but MUST continue. 678 implementation MAY log an error, but MUST continue.
679 </li> 679 </li>
680 <li> 680 <li>
681 If the "Record Route" flag is set in OPTIONS, add the local peer ID 681 If the <tt>RecordRoute</tt> flag is set in OPTIONS, the local peer ID
682 to PUTPATH. FIXME: Should should come way later (?) 682 MUST be appended to the <tt>PUTPATH</tt> of the message.
683 </li> 683 </li>
684 <li> 684 <li>
685 If the local peer is the closest peer (AM-CLOSEST-PEER) or the 685 If the local peer is the closest peer (<tt>AM-CLOSEST-PEER</tt> is true) or the
686 "Demultiplex Everywhere" options flag ist set, the message MUST 686 <tt>DemultiplexEverywhere</tt> options flag ist set, the message MUST
687 be stored locally in the block storage. 687 be stored locally in the block storage.
688 </li> 688 </li>
689 <li> 689 <li>
@@ -786,14 +786,16 @@ END
786 <section anchor="p2p_get_processing"> 786 <section anchor="p2p_get_processing">
787 <name>Processing</name> 787 <name>Processing</name>
788 <t> 788 <t>
789 Upon receiving a GET message from a connected peer. An implementation 789 Upon receiving a <tt>GetMmessage</tt> from a connected peer an
790 MUST process it step by step as follows: 790 implementation MUST process it step by step as follows:
791 </t> 791 </t>
792 <ol> 792 <ol>
793 <li> 793 <li>
794 The KEY and XQUERY is validated against the requested BTYPE. 794 The <tt>KEY</tt> and <tt>XQUERY</tt> is validated against the
795 If the BTYPE is not supported, or if the block key 795 requested <tt>BTYPE</tt> as defined by its respective
796 does not match the BTYPE or if the XQUERY is malformed, 796 <tt>ValidateBlockQuery</tt> procedure.
797 If the <tt>BTYPE</tt> is not supported, or if the block key
798 does not match or if the <tt>XQUERY</tt> is malformed,
797 the message MUST be discarded. 799 the message MUST be discarded.
798 </li> 800 </li>
799 <li> 801 <li>
@@ -803,14 +805,14 @@ END
803 <li> 805 <li>
804 <t> 806 <t>
805 If the local peer is the closest peer (AM-CLOSEST-PEER) or the 807 If the local peer is the closest peer (AM-CLOSEST-PEER) or the
806 "Demultiplex Everywhere" options flag is set, a reply MUST be 808 <tt>DemultiplexEverywhere</tt> options flag is set, a reply
807 produced: 809 MUST be produced:
808 </t> 810 </t>
809 <ol> 811 <ol>
810 <li> 812 <li>
811 If OPTIONS indicate a "Find Peer" request, FIXME the peer selection 813 If OPTIONS indicate a <tt>FindPeer</tt> request, FIXME the peer selection
812 foo from buckets that probably needs fixing. Take into account 814 foo from buckets that probably needs fixing. Take into account
813 REPLY_BF 815 <tt>REPLY_BF</tt>
814 </li> 816 </li>
815 <li> 817 <li>
816 Else, if there is a BLOCK in the local Block Storage which is 818 Else, if there is a BLOCK in the local Block Storage which is
@@ -820,7 +822,10 @@ END
820 </ol> 822 </ol>
821 </li> 823 </li>
822 <li> 824 <li>
823 FIXME: We only handle if not GNUNET_BLOCK_EVALUATION_OK_LAST?? 825 FIXME: We only handle if not GNUNET_BLOCK_EVALUATION_OK_LAST.
826 This means that we must evaluate the Reply produced in the
827 previous step using <tt>ValidateBlockReply</tt> for this
828 <tt>BTYPE</tt>
824 </li> 829 </li>
825 <li> 830 <li>
826 Given the value in REPL_LVL, the number of peers to forward to 831 Given the value in REPL_LVL, the number of peers to forward to