[PATCH obexd 1/2] gobex: remove extra define of G_OBEX_RSP_SUCCESS

[PATCH obexd 1/2] gobex: remove extra define of G_OBEX_RSP_SUCCESS

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

---
 gobex/gobex-packet.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/gobex/gobex-packet.h b/gobex/gobex-packet.h
index 24c9dcc..e4cea0b 100644
--- a/gobex/gobex-packet.h
+++ b/gobex/gobex-packet.h
@@ -41,7 +41,6 @@
 /* Response codes */
 #define G_OBEX_RSP_CONTINUE			0x10
 #define G_OBEX_RSP_SUCCESS			0x20
-#define G_OBEX_RSP_SUCCESS			0x20
 #define G_OBEX_RSP_CREATED			0x21
 #define G_OBEX_RSP_ACCEPTED			0x22
 #define G_OBEX_RSP_NON_AUTHORITATIVE		0x23
-- 
1.7.6.4

[PATCH obexd 2/2] gobex: add check for connection id

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

Since gobex maintain the connection id of the session it is more
convenient to check whether the incoming request connection matches
before calling the application handlers.
---
 gobex/gobex.c |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/gobex/gobex.c b/gobex/gobex.c
index 61edbd5..62424ff 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -681,16 +681,39 @@ static void handle_response(GObex *obex, GError *err, GObexPacket *rsp)
 		enable_tx(obex);
 }
 
+static gboolean check_connid(GObex *obex, GObexPacket *pkt)
+{
+	GObexHeader *hdr;
+	guint32 id;
+
+	if (obex->conn_id == CONNID_INVALID)
+		return TRUE;
+
+	hdr = g_obex_packet_get_header(pkt, G_OBEX_HDR_CONNECTION);
+	if (hdr == NULL)
+		return FALSE;
+
+	g_obex_header_get_uint32(hdr, &id);
+
+	return obex->conn_id == id;
+}
+
 static void handle_request(GObex *obex, GObexPacket *req)
 {
 	GSList *match;
 	guint op;
 
-	if (g_obex_packet_get_operation(req, NULL) == G_OBEX_OP_CONNECT)
-		parse_connect_data(obex, req);
-
 	op = g_obex_packet_get_operation(req, NULL);
 
+	if (op == G_OBEX_OP_CONNECT)
+		parse_connect_data(obex, req);
+	else if (check_connid(obex, req) == FALSE) {
+		g_obex_debug(G_OBEX_DEBUG_ERROR, "Connection id don't match");
+		g_obex_send_rsp(obex, G_OBEX_RSP_SERVICE_UNAVAILABLE, NULL,
+							G_OBEX_HDR_INVALID);
+		return;
+	}
+
 	match = g_slist_find_custom(obex->req_handlers, GUINT_TO_POINTER(op),
 							req_handler_cmpop);
 	if (match) {
-- 
1.7.6.4

Re: [PATCH obexd 1/2] gobex: remove extra define of G_OBEX_RSP_SUCCESS

[Johan Hedberg]

Hi Luiz,

On Mon, Nov 07, 2011, Luiz Augusto von Dentz wrote:
> ---
>  gobex/gobex-packet.h |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)

Both patches have been applied. Thanks.

Johan

Re: [PATCH obexd 2/2] gobex: add check for connection id

[Hendrik Sattler]

Am 07.11.2011 13:29, schrieb Luiz Augusto von Dentz:
> +		g_obex_debug(G_OBEX_DEBUG_ERROR, "Connection id don't match");

s/don't/does not/

HS

Re: [PATCH obexd 2/2] gobex: add check for connection id

[Johan Hedberg]

On Mon, Nov 07, 2011, Hendrik Sattler wrote:
> Am 07.11.2011 13:29, schrieb Luiz Augusto von Dentz:
> >+		g_obex_debug(G_OBEX_DEBUG_ERROR, "Connection id don't match");
> 
> s/don't/does not/

I already fixed this before pushing.

Johan