Merge pull request #80 from mteijiro/mteijiro_psn_error_log_fix

Add fix for PSN mismstch compilation error
Fitbit · Feb 9, 2024 · 417aad0 · 417aad0
2 parents 98ec482 + fff4f6d
commit 417aad0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/xp/annotations/gg_annotations.h b/xp/annotations/gg_annotations.h
@@ -81,15 +81,16 @@ typedef struct {
                                   .error_details = GG_ANNOT_ERR(err),   \
                                   .has_error_code = false})
 
-#define GG_LOG_COMMS_ERROR_PSN(err, exp_psn, rec_psn) \
-    GG_LOG_O_SEVERE(comms_error, {.has_error_details = true,              \
-                                  .error_details = GG_ANNOT_ERR(err),     \
-                                  .has_unexpected_psn = true,             \
-                                  .unexpected_psn = {                     \
-                                    .has_expected_psn = true,             \
-                                    .expected_psn = exp_psn,              \
-                                    .has_received_psn = true,             \
-                                    .received_psn = rec_psn},             \
+#define GG_LOG_COMMS_ERROR_PSN(err, exp_psn, rec_psn)                                 \
+    GG_LOG_O_SEVERE(comms_error, {.has_error_details = true,                          \
+                                  .error_details = GG_ANNOT_ERR(err),                 \
+                                  .which_error_info =                                 \
+                                    site_log_GoldenGate_CommsError_unexpected_psn_tag,\
+                                  .error_info.unexpected_psn = {                      \
+                                    .has_expected_psn = true,                         \
+                                    .expected_psn = exp_psn,                          \
+                                    .has_received_psn = true,                         \
+                                    .received_psn = rec_psn},                         \
                                   .has_error_code = false})
 
 #define GG_LOG_COMMS_ERROR_CODE(err, code)                              \

diff --git a/xp/gattlink/gg_gattlink.c b/xp/gattlink/gg_gattlink.c
@@ -921,7 +921,7 @@ GG_GattlinkProtocol_HandleDataPacket(GG_GattlinkProtocol* self,
         GG_LOG_WARNING("Received previously received PSN (%d) != Expected (%d), Re-acking with last received PSN (%d)",
                        (int)psn, (int)self->in.next_expected_data_psn, self->out.psn_to_ack_with);
         GG_LOG_COMMS_ERROR_PSN(GG_LIB_GATTLINK_UNEXPECTED_PSN,
-                               (int)self->out.psn_to_ack_with, (int)psn);
+                               (int)self->out.next_expected_ack_sn, (int)psn);
     }
 
     // Increment the number of unacked packets