From c8e39cad4d468e8f30f3c3da4792ac3effa0aa86 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Fri, 13 May 2022 17:16:01 +0200
Subject: [PATCH] goep_server: set response code in goep_server_execute

---
 src/classic/goep_server.c |  9 ++++++---
 src/classic/goep_server.h | 10 ++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/classic/goep_server.c b/src/classic/goep_server.c
index 5e0a1399e..4e2ccc366 100644
--- a/src/classic/goep_server.c
+++ b/src/classic/goep_server.c
@@ -51,6 +51,7 @@
 #include "btstack_event.h"
 
 #include "classic/goep_server.h"
+#include "classic/obex.h"
 #include "classic/obex_message_builder.h"
 
 #ifdef ENABLE_GOEP_L2CAP
@@ -590,7 +591,7 @@ uint8_t goep_server_response_create_connect(uint16_t goep_cid, uint8_t obex_vers
     return obex_message_builder_response_create_connect(buffer, buffer_len, obex_version_number, flags, maximum_obex_packet_length, (uint32_t) goep_cid);
 }
 
-uint8_t goep_server_response_create_general(uint16_t goep_cid, uint8_t opcode){
+uint8_t goep_server_response_create_general(uint16_t goep_cid){
     goep_server_connection_t * connection = goep_server_get_connection_for_goep_cid(goep_cid);
     if (connection == NULL) {
         return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
@@ -598,7 +599,7 @@ uint8_t goep_server_response_create_general(uint16_t goep_cid, uint8_t opcode){
     goep_server_packet_init(connection);
     uint8_t * buffer = goep_server_get_outgoing_buffer(connection);
     uint16_t buffer_len = goep_server_get_outgoing_buffer_len(connection);
-    return obex_message_builder_response_create_general(buffer, buffer_len, opcode);
+    return obex_message_builder_response_create_general(buffer, buffer_len, OBEX_RESP_SUCCESS);
 }
 
 uint16_t goep_server_response_get_max_body_size(uint16_t goep_cid){
@@ -656,13 +657,15 @@ uint8_t goep_server_header_add_application_parameters(uint16_t goep_cid, const u
     return obex_message_builder_header_add_application_parameters(buffer, buffer_len, data, length);
 }
 
-uint8_t goep_server_execute(uint16_t goep_cid){
+uint8_t goep_server_execute(uint16_t goep_cid, uint8_t response_code){
     goep_server_connection_t * connection = goep_server_get_connection_for_goep_cid(goep_cid);
     if (connection == NULL) {
         return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
     }
 
     uint8_t * buffer = goep_server_get_outgoing_buffer(connection);
+    // set reponse code
+    buffer[0] = response_code;
     uint16_t pos = big_endian_read_16(buffer, 1);
     switch (connection->type) {
 #ifdef ENABLE_GOEP_L2CAP
diff --git a/src/classic/goep_server.h b/src/classic/goep_server.h
index a32eea0a4..322bd24a8 100644
--- a/src/classic/goep_server.h
+++ b/src/classic/goep_server.h
@@ -144,12 +144,13 @@ uint8_t goep_server_request_can_send_now(uint16_t goep_cid);
 uint8_t goep_server_response_create_connect(uint16_t goep_cid, uint8_t obex_version_number, uint8_t flags, uint16_t maximum_obex_packet_length);
 
 /**
- * @brief Start General response with opcode
+ * @brief Start General response
+ * @note response code is set by goep_server_execute
  * @param goep_cid
  * @param opcode
  * @return status
  */
-uint8_t goep_server_response_create_general(uint16_t goep_cid, uint8_t opcode);
+uint8_t goep_server_response_create_general(uint16_t goep_cid);
 
 /**
  * @brief Get max size of body data that can be added to current response with goep_server_header_add_end_of_body
@@ -195,11 +196,12 @@ uint8_t goep_server_header_add_srm_enable(uint16_t goep_cid);
 uint8_t goep_server_header_add_application_parameters(uint16_t goep_cid, const uint8_t * data, uint16_t length);
 
 /**
- * @brief Execute prepared request
+ * @brief Send prepared response
  * @param goep_cid
+ * @param response_code
  * @return status
  */
-uint8_t goep_server_execute(uint16_t goep_cid);
+uint8_t goep_server_execute(uint16_t goep_cid, uint8_t response_code);
 
 /**
  * De-Init