korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2025-01-19 10:05:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

gobex: Rename GObexRequest to GObexPacket

Browse Source
This commit is contained in:
Johan Hedberg 2011-06-26 23:27:42 +03:00 committed by Marcel Holtmann
parent e2576cb1cb
commit 9966d11291
3 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
gobex/gobex.c
View File

@ -50,16 +50,16 @@ struct _GObexHeader {
} v;
};
struct _GObexRequest {
struct _GObexPacket {
guint8 opcode;
GObexDataPolicy data_policy;
union {
void *data; /* Non-header data */
const void *data_ref; /* Reference to non-header data */
} req;
size_t req_data_len;
void *buf; /* Non-header data */
const void *buf_ref; /* Reference to non-header data */
} data;
size_t data_len;
size_t hlen; /* Length of all encoded headers */
GSList *headers;
@ -360,41 +360,41 @@ GObexHeader *g_obex_header_uint32(guint8 id, guint32 val)
return header;
}
gboolean g_obex_request_add_header(GObexRequest *req, GObexHeader *header)
gboolean g_obex_packet_add_header(GObexPacket *pkt, GObexHeader *header)
{
req->headers = g_slist_append(req->headers, header);
req->hlen += header->hlen;
pkt->headers = g_slist_append(pkt->headers, header);
pkt->hlen += header->hlen;
return TRUE;
}
GObexRequest *g_obex_request_new(guint8 opcode)
GObexPacket *g_obex_packet_new(guint8 opcode)
{
GObexRequest *req;
GObexPacket *pkt;
req = g_new0(GObexRequest, 1);
pkt = g_new0(GObexPacket, 1);
req->opcode = opcode;
pkt->opcode = opcode;
req->data_policy = G_OBEX_DATA_COPY;
pkt->data_policy = G_OBEX_DATA_COPY;
return req;
return pkt;
}
void g_obex_request_free(GObexRequest *req)
void g_obex_packet_free(GObexPacket *pkt)
{
switch (req->data_policy) {
switch (pkt->data_policy) {
case G_OBEX_DATA_INHERIT:
case G_OBEX_DATA_COPY:
g_free(req->req.data);
g_free(pkt->data.buf);
break;
case G_OBEX_DATA_REF:
break;
}
g_slist_foreach(req->headers, (GFunc) g_obex_header_free, NULL);
g_slist_free(req->headers);
g_free(req);
g_slist_foreach(pkt->headers, (GFunc) g_obex_header_free, NULL);
g_slist_free(pkt->headers);
g_free(pkt);
}
static ssize_t get_header_offset(guint8 opcode)
@ -415,7 +415,7 @@ static ssize_t get_header_offset(guint8 opcode)
}
}
static gboolean parse_headers(GObexRequest *req, const void *data, size_t len,
static gboolean parse_headers(GObexPacket *pkt, const void *data, size_t len,
GObexDataPolicy data_policy)
{
const guint8 *buf = data;
@ -428,7 +428,7 @@ static gboolean parse_headers(GObexRequest *req, const void *data, size_t len,
if (header == NULL)
return FALSE;
req->headers = g_slist_append(req->headers, header);
pkt->headers = g_slist_append(pkt->headers, header);
len -= parsed;
buf += parsed;
@ -437,14 +437,14 @@ static gboolean parse_headers(GObexRequest *req, const void *data, size_t len,
return TRUE;
}
GObexRequest *g_obex_request_decode(const void *data, size_t len,
GObexPacket *g_obex_packet_decode(const void *data, size_t len,
GObexDataPolicy data_policy)
{
const guint8 *buf = data;
guint16 packet_len;
guint8 opcode;
ssize_t header_offset;
GObexRequest *req;
GObexPacket *pkt;
if (len < 3)
return NULL;
@ -460,9 +460,9 @@ GObexRequest *g_obex_request_decode(const void *data, size_t len,
if (header_offset < 0)
return NULL;
req = g_obex_request_new(opcode);
pkt = g_obex_packet_new(opcode);
req->data_policy = data_policy;
pkt->data_policy = data_policy;
if (header_offset == 0)
goto headers;
@ -470,14 +470,14 @@ GObexRequest *g_obex_request_decode(const void *data, size_t len,
if (3 + header_offset < (ssize_t) len)
goto failed;
req->req_data_len = header_offset;
pkt->data_len = header_offset;
switch (data_policy) {
case G_OBEX_DATA_COPY:
req->req.data = g_malloc(header_offset);
buf = get_bytes(req->req.data, buf, header_offset);
pkt->data.buf = g_malloc(header_offset);
buf = get_bytes(pkt->data.buf, buf, header_offset);
break;
case G_OBEX_DATA_REF:
req->req.data_ref = buf;
pkt->data.buf_ref = buf;
buf += header_offset;
break;
default:
@ -485,23 +485,23 @@ GObexRequest *g_obex_request_decode(const void *data, size_t len,
}
headers:
if (!parse_headers(req, buf, len - (buf - (guint8 *) data),
if (!parse_headers(pkt, buf, len - (buf - (guint8 *) data),
data_policy))
goto failed;
return req;
return pkt;
failed:
g_obex_request_free(req);
g_obex_packet_free(pkt);
return NULL;
}
gboolean g_obex_send(GObex *obex, GObexRequest *req)
gboolean g_obex_send(GObex *obex, GObexPacket *pkt)
{
if (obex == NULL || req == NULL)
if (obex == NULL || pkt == NULL)
return FALSE;
g_queue_push_tail(obex->req_queue, req);
g_queue_push_tail(obex->req_queue, pkt);
return TRUE;
}
@ -543,7 +543,7 @@ void g_obex_unref(GObex *obex)
if (!last_ref)
return;
g_queue_foreach(obex->req_queue, (GFunc) g_obex_request_free, NULL);
g_queue_foreach(obex->req_queue, (GFunc) g_obex_packet_free, NULL);
g_queue_free(obex->req_queue);
g_io_channel_unref(obex->io);

12
gobex/gobex.h
View File

@ -69,7 +69,7 @@ typedef enum {
} GObexDataPolicy;
typedef struct _GObex GObex;
typedef struct _GObexRequest GObexRequest;
typedef struct _GObexPacket GObexPacket;
typedef struct _GObexHeader GObexHeader;
GObexHeader *g_obex_header_unicode(guint8 id, const char *str);
@ -83,15 +83,15 @@ GObexHeader *g_obex_header_decode(const void *data, size_t len,
GObexDataPolicy data_policy, size_t *parsed);
void g_obex_header_free(GObexHeader *header);
gboolean g_obex_request_add_header(GObexRequest *req, GObexHeader *header);
gboolean g_obex_packet_add_header(GObexPacket *req, GObexHeader *header);
GObexRequest *g_obex_request_new(guint8 opcode);
void g_obex_request_free(GObexRequest *req);
GObexPacket *g_obex_packet_new(guint8 opcode);
void g_obex_packet_free(GObexPacket *req);
GObexRequest *g_obex_request_decode(const void *data, size_t len,
GObexPacket *g_obex_packet_decode(const void *data, size_t len,
GObexDataPolicy data_policy);
gboolean g_obex_send(GObex *obex, GObexRequest *req);
gboolean g_obex_send(GObex *obex, GObexPacket *req);
GObex *g_obex_new(GIOChannel *io);

24
unit/test-gobex.c
View File

@ -149,15 +149,15 @@ static void test_header_uint32(void)
g_obex_header_free(header);
}
static void test_decode_req(void)
static void test_decode_pkt(void)
{
GObexRequest *req;
GObexPacket *pkt;
uint8_t buf[] = { G_OBEX_OP_PUT, 0x00, 0x03 };
req = g_obex_request_decode(buf, sizeof(buf), G_OBEX_DATA_REF);
g_assert(req != NULL);
pkt = g_obex_packet_decode(buf, sizeof(buf), G_OBEX_DATA_REF);
g_assert(pkt != NULL);
g_obex_request_free(req);
g_obex_packet_free(pkt);
}
static void parse_and_encode(uint8_t *buf, size_t buf_len)
@ -333,15 +333,15 @@ static void test_parse_header_multi(void)
g_byte_array_unref(buf);
}
static void test_req(void)
static void test_pkt(void)
{
GObexRequest *req;
GObexPacket *pkt;
req = g_obex_request_new(G_OBEX_OP_PUT);
pkt = g_obex_packet_new(G_OBEX_OP_PUT);
g_assert(req != NULL);
g_assert(pkt != NULL);
g_obex_request_free(req);
g_obex_packet_free(pkt);
}
static void test_ref_unref(void)
@ -386,7 +386,7 @@ int main(int argc, char *argv[])
g_test_add_func("/gobex/basic", test_basic);
g_test_add_func("/gobex/ref_unref", test_ref_unref);
g_test_add_func("/gobex/test_req", test_req);
g_test_add_func("/gobex/test_pkt", test_pkt);
g_test_add_func("/gobex/test_parse_header_connid",
test_parse_header_connid);
@ -422,7 +422,7 @@ int main(int argc, char *argv[])
g_test_add_func("/gobex/test_header_uint8", test_header_uint8);
g_test_add_func("/gobex/test_header_uint32", test_header_uint32);
g_test_add_func("/gobex/test_decode_req", test_decode_req);
g_test_add_func("/gobex/test_decode_pkt", test_decode_pkt);
g_test_run();