PABotBase2

Author: Mysticial

Common/Cpp/StreamConnections/MockDevice.cpp

@@ -11,10 +11,13 @@
 using std::cout;
 using std::endl;
 
-
+#if 0
 #define PABB2_DROP_HOST_TO_DEVICE   0.2
 #define PABB2_DROP_DEVICE_TO_HOST   0.2
-
+#else
+#define PABB2_DROP_HOST_TO_DEVICE   0
+#define PABB2_DROP_DEVICE_TO_HOST   0
+#endif
 
 namespace PokemonAutomation{
 

Common/Cpp/StreamConnections/ReliableStreamConnection.cpp

@@ -82,6 +82,18 @@ void ReliableStreamConnection::wait_for_pending(){
 //  Send Path
 //
 
+void ReliableStreamConnection::reset(){
+    {
+        std::lock_guard<std::mutex> lg(m_lock);
+        pabb2_PacketSender_reset(&m_reliable_sender);
+        pabb2_PacketParser_reset(&m_parser);
+        pabb2_StreamCoalescer_reset(&m_stream_coalescer);
+        throw_if_cancelled();
+        pabb2_PacketSender_send_packet(&m_reliable_sender, PABB2_CONNECTION_OPCODE_ASK_RESET, 0, nullptr);
+    }
+    m_cv.notify_all();
+    wait_for_pending();
+}
 size_t ReliableStreamConnection::send(const void* data, size_t bytes){
     std::lock_guard<std::mutex> lg(m_lock);
     throw_if_cancelled();

Common/Cpp/StreamConnections/ReliableStreamConnection.h

@@ -11,7 +11,7 @@
 #include <condition_variable>
 #include "Common/Cpp/Time.h"
 #include "Common/Cpp/CancellableScope.h"
-#include "Common/Cpp/Logging/TaggedLogger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "Common/Cpp/Concurrency/Thread.h"
 #include "Common/PABotBase2/PABotBase2_PacketSender.h"
 #include "Common/PABotBase2/PABotBase2_PacketParser.h"
@@ -42,12 +42,14 @@ class ReliableStreamConnection final
     virtual bool cancel(std::exception_ptr exception) noexcept override;
     void wait_for_pending();
 
+    void reset();
+
     //  Send stream data.
     virtual size_t send(const void* data, size_t bytes) override;
 
     bool try_send_request(uint8_t opcode);
     void send_request(uint8_t opcode);
-//    void verify_version();
+
 
 
 private:

Common/PABotBase2/PABotBase2_StreamCoalescer.c

@@ -7,10 +7,11 @@
 #include <string.h>
 #include "PABotBase2_StreamCoalescer.h"
 
-#include <stdio.h>  //  REMOVE
-#include "PABotBase2_ConnectionDebug.h" //  REMOVE
+//#include <stdio.h>  //  REMOVE
+//#include "PABotBase2_ConnectionDebug.h" //  REMOVE
 
 void pabb2_StreamCoalescer_init(pabb2_StreamCoalescer* self){
+//    printf("pabb2_StreamCoalescer_init(%p)\n", self);
     self->slot_head = 0;
     self->slot_tail = 0;
     self->stream_head = 0;
@@ -64,8 +65,11 @@ void pabb2_StreamCoalescer_pop_leading_finished(pabb2_StreamCoalescer* self){
     uint8_t slot_head = self->slot_head;
     uint8_t slot_tail = self->slot_tail;
 
+//    printf("pabb2_StreamCoalescer_pop_leading_finished()\n");
+
     while (slot_head != slot_tail){
         uint8_t* slot = &self->lengths[slot_head & PABB2_StreamCoalescer_SLOTS_MASK];
+//        printf("slot[%d] = %d\n", slot_head, *slot);
         if (*slot != 0xff){
             break;
         }
@@ -90,8 +94,11 @@ void pabb2_StreamCoalescer_push_packet(pabb2_StreamCoalescer* self, uint8_t seqn
 //    printf("enter ---------------------\n");
 //    pabb2_StreamCoalescer_print(self, false);
 
+//    printf("pabb2_StreamCoalescer_push_packet(%p): seqnum = %d, slot_head = %d\n", self, seqnum, slot_head);
+
     //  Either before (old retransmit) or too far in future.
     if ((uint8_t)(seqnum - slot_head) >= PABB2_StreamCoalescer_SLOTS){
+//        printf("Device: Packet is out of range.\n");
         return;
     }
 
@@ -118,12 +125,14 @@ bool pabb2_StreamCoalescer_push_stream(pabb2_StreamCoalescer* self, const pabb2_
 
     //  Zero does not fall through cleanly. So handle it here.
     if (stream_size == 0){
+//        printf("Device: stream_size == 0\n");
         pabb2_StreamCoalescer_push_packet(self, packet->seqnum);
         return true;
     }
 
     //  Data is larger than the entire buffer.
     if (stream_size > PABB2_StreamCoalescer_BUFFER_SIZE){
+//        printf("Device: stream_size > PABB2_StreamCoalescer_BUFFER_SIZE\n");
         return false;
     }
 
@@ -133,7 +142,9 @@ bool pabb2_StreamCoalescer_push_stream(pabb2_StreamCoalescer* self, const pabb2_
     //  Either before (old retransmit) or too far in future.
     {
         uint8_t diff = seqnum - slot_head;
+//        printf("seqnum = %d, slot_head = %d\n", seqnum, slot_head);
         if (diff >= PABB2_StreamCoalescer_SLOTS){
+//            printf("Device: In the past.\n");
             //  Negative means we're in the past and we can just ack.
             return diff & 0x80;
         }
@@ -146,6 +157,7 @@ bool pabb2_StreamCoalescer_push_stream(pabb2_StreamCoalescer* self, const pabb2_
 
     //  Too far ahead that it's beyond our window.
     if (stream_offset_e - self->stream_head > PABB2_StreamCoalescer_BUFFER_SIZE){
+//        printf("Device: To far in future.\n");
         return false;
     }
 

Common/PABotBase2/PABotbase2_ReliableStreamConnection.c

@@ -74,8 +74,10 @@ void pabb2_ReliableStreamConnection_run_events(pabb2_ReliableStreamConnection* s
         pabb2_PacketSender_reset(&self->reliable_sender);
         pabb2_PacketParser_reset(&self->parser);
         pabb2_StreamCoalescer_reset(&self->stream_coalescer);
+        pabb2_StreamCoalescer_push_packet(&self->stream_coalescer, 0);
         return;
     case PABB2_CONNECTION_OPCODE_ASK_VERSION:
+        pabb2_StreamCoalescer_push_packet(&self->stream_coalescer, packet->seqnum);
         pabb2_PacketSender_send_ack_u32(
             &self->reliable_sender,
             packet->seqnum,
@@ -84,6 +86,7 @@ void pabb2_ReliableStreamConnection_run_events(pabb2_ReliableStreamConnection* s
         );
         return;
     case PABB2_CONNECTION_OPCODE_ASK_PACKET_SIZE:
+        pabb2_StreamCoalescer_push_packet(&self->stream_coalescer, packet->seqnum);
         pabb2_PacketSender_send_ack_u16(
             &self->reliable_sender,
             packet->seqnum,
@@ -92,6 +95,7 @@ void pabb2_ReliableStreamConnection_run_events(pabb2_ReliableStreamConnection* s
         );
         return;
     case PABB2_CONNECTION_OPCODE_ASK_BUFFER_SLOTS:
+        pabb2_StreamCoalescer_push_packet(&self->stream_coalescer, packet->seqnum);
         pabb2_PacketSender_send_ack_u8(
             &self->reliable_sender,
             packet->seqnum,
@@ -100,6 +104,7 @@ void pabb2_ReliableStreamConnection_run_events(pabb2_ReliableStreamConnection* s
         );
         return;
     case PABB2_CONNECTION_OPCODE_ASK_BUFFER_BYTES:
+        pabb2_StreamCoalescer_push_packet(&self->stream_coalescer, packet->seqnum);
         pabb2_PacketSender_send_ack_u16(
             &self->reliable_sender,
             packet->seqnum,
@@ -108,14 +113,19 @@ void pabb2_ReliableStreamConnection_run_events(pabb2_ReliableStreamConnection* s
         );
         return;
     case PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA:
+//        printf("Device: PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA\n");
         if (pabb2_StreamCoalescer_push_stream(&self->stream_coalescer, (const pabb2_PacketHeaderData*)packet)){
+            printf("Device: Succeeded push.\n");
             pabb2_PacketSender_send_ack_u16(
                 &self->reliable_sender,
                 packet->seqnum,
                 PABB2_CONNECTION_OPCODE_RET_STREAM_DATA,
                 pabb2_StreamCoalescer_bytes_available(&self->stream_coalescer)
             );
+        }else{
+            printf("Device: Failed to push.\n");
         }
+        fflush(stdout);
         return;
     default:
         pabb2_PacketSender_send_info(

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp

@@ -311,6 +311,8 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
             1s
         );
 
+        connection.reset();
+
         connection.send_request(PABB2_CONNECTION_OPCODE_ASK_VERSION);
         connection.wait_for_pending();
 
@@ -320,12 +322,8 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
         connection.send_request(PABB2_CONNECTION_OPCODE_ASK_BUFFER_SLOTS);
         connection.wait_for_pending();
 
-        connection.send_request(PABB2_CONNECTION_OPCODE_ASK_RESET);
-        connection.wait_for_pending();
-
 
-        connection.send_request(PABB2_CONNECTION_OPCODE_ASK_VERSION);
-        connection.wait_for_pending();
+        connection.send("asdf", 4);
 
 
         scope.wait_for(60s);