[maemo-commits] [maemo-commits] r8846 - projects/connectivity/osso-gwconnect/trunk/src

[From: subversion at stage.maemo.org]

Author: jh
Date: 2006-12-21 11:52:53 +0200 (Thu, 21 Dec 2006)
New Revision: 8846

Modified:
   projects/connectivity/osso-gwconnect/trunk/src/sdp-query.c
Log:
Use SS + SA requests instead of SSA

Modified: projects/connectivity/osso-gwconnect/trunk/src/sdp-query.c
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/src/sdp-query.c	2006-12-21 09:09:07 UTC (rev 8845)
+++ projects/connectivity/osso-gwconnect/trunk/src/sdp-query.c	2006-12-21 09:52:53 UTC (rev 8846)
@@ -214,26 +214,38 @@
 static void get_sdp_info(uuid_t *uuid, sdp_session_t *sess)
 {
     uint32_t range = 0x0000ffff;
-    sdp_list_t *attrid, *search, *seq, *next;
+    sdp_list_t *attrid, *search, *rsp, *next;
 
-    attrid = sdp_list_append(0, &range);
     search = sdp_list_append(0, uuid);
-    if (sdp_service_search_attr_req(sess, search, SDP_ATTR_REQ_RANGE, attrid, &seq)) {
+
+    if (sdp_service_search_req(sess, search, 10, &rsp)) {
         error("Service Discovery failed: %s\n", g_strerror(errno));
+        sdp_list_free(search, 0);
         return;
     }
-    sdp_list_free(attrid, 0);
-    sdp_list_free(search, 0);
 
-    for (; seq; seq = next) {
-        sdp_record_t *rec = (sdp_record_t *) seq->data;
-    
+    attrid = sdp_list_append(0, &range);
+
+    for (; rsp; rsp = next) {
+        uint32_t *handle;
+        sdp_record_t *rec;
+
+        handle = rsp->data;
+
+        rec = sdp_service_attr_req(sess, *handle, SDP_ATTR_REQ_RANGE, attrid);
+        if (!rec)
+            continue;
+
         add_new_service(rec);
 
-        next = seq->next;
-        free(seq);
+        next = rsp->next;
+        free(handle);
+        free(rsp);
         sdp_record_free(rec);
     }
+
+    sdp_list_free(attrid, 0);
+    sdp_list_free(search, 0);
 }
 
 static void query_error(void)