Fix ATT utility functions naming

If we want to support both client and server roles, we must be clear that we
are encoding/decoding requests or responses.

diff --git a/attrib/att.c b/attrib/att.c
index 4792648..14dd274 100644 (file)
--- a/attrib/att.c
+++ b/attrib/att.c
@@ -85,7 +85,7 @@ void att_data_list_free(struct att_data_list *list)
        free(list);
 }
 
-uint16_t att_read_by_grp_type_encode(uint16_t start, uint16_t end, uuid_t *uuid,
+uint16_t enc_read_by_grp_req(uint16_t start, uint16_t end, uuid_t *uuid,
                                                        uint8_t *pdu, int len)
 {
        uint16_t *p16;
@@ -112,7 +112,7 @@ uint16_t att_read_by_grp_type_encode(uint16_t start, uint16_t end, uuid_t *uuid,
        return 7;
 }
 
-struct att_data_list *att_read_by_grp_type_decode(const uint8_t *pdu, int len)
+struct att_data_list *dec_read_by_grp_resp(const uint8_t *pdu, int len)
 {
        struct att_data_list *list;
        const uint8_t *ptr;
@@ -137,13 +137,13 @@ struct att_data_list *att_read_by_grp_type_decode(const uint8_t *pdu, int len)
        return list;
 }
 
-uint16_t att_find_by_type_encode(uint16_t start, uint16_t end, uuid_t *uuid,
+uint16_t enc_find_by_type_req(uint16_t start, uint16_t end, uuid_t *uuid,
                                                        uint8_t *pdu, int len)
 {
        return 0;
 }
 
-uint16_t att_read_by_type_encode(uint16_t start, uint16_t end, uuid_t *uuid,
+uint16_t enc_read_by_type_req(uint16_t start, uint16_t end, uuid_t *uuid,
                                                        uint8_t *pdu, int len)
 {
        uint16_t *p16;
@@ -170,7 +170,7 @@ uint16_t att_read_by_type_encode(uint16_t start, uint16_t end, uuid_t *uuid,
        return 7;
 }
 
-struct att_data_list *add_read_by_type_decode(const uint8_t *pdu, int len)
+struct att_data_list *dec_read_by_type_resp(const uint8_t *pdu, int len)
 {
        struct att_data_list *list;
        const uint8_t *ptr;

diff --git a/attrib/att.h b/attrib/att.h
index b7c975e..0a16ff1 100644 (file)
--- a/attrib/att.h
+++ b/attrib/att.h
@@ -123,14 +123,14 @@ struct att_data_list {
 void att_data_list_free(struct att_data_list *list);
 
 const char *att_ecode2str(uint8_t status);
-uint16_t att_read_by_grp_type_encode(uint16_t start, uint16_t end, uuid_t *uuid,
+uint16_t enc_read_by_grp_req(uint16_t start, uint16_t end, uuid_t *uuid,
                                                        uint8_t *pdu, int len);
-uint16_t att_find_by_type_encode(uint16_t start, uint16_t end, uuid_t *uuid,
+uint16_t enc_find_by_type_req(uint16_t start, uint16_t end, uuid_t *uuid,
                                                        uint8_t *pdu, int len);
-struct att_data_list *att_read_by_grp_type_decode(const uint8_t *pdu, int len);
-uint16_t att_read_by_type_encode(uint16_t start, uint16_t end, uuid_t *uuid,
+struct att_data_list *dec_read_by_grp_resp(const uint8_t *pdu, int len);
+uint16_t enc_read_by_type_req(uint16_t start, uint16_t end, uuid_t *uuid,
                                                        uint8_t *pdu, int len);
-struct att_data_list *add_read_by_type_decode(const uint8_t *pdu, int len);
+struct att_data_list *dec_read_by_type_resp(const uint8_t *pdu, int len);
 
 #ifdef __cplusplus
 }

diff --git a/attrib/client.c b/attrib/client.c
index 2f1698e..d840c76 100644 (file)
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -142,8 +142,7 @@ static guint gatt_discover_primary(GAttrib *attrib, uint16_t start,
 
        sdp_uuid16_create(&uuid, GATT_PRIM_SVC_UUID);
 
-       plen = att_read_by_grp_type_encode(start, end,
-                                       &uuid, pdu, sizeof(pdu));
+       plen = enc_read_by_grp_req(start, end, &uuid, pdu, sizeof(pdu));
        if (plen == 0)
                return 0;