Hello community, here is the log from the commit of package bluez-libs checked in at Tue Aug 28 18:42:08 CEST 2007. -------- --- bluez-libs/bluez-libs.changes 2007-08-10 18:19:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-libs/bluez-libs.changes 2007-08-28 11:34:15.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 28 11:33:25 CEST 2007 - tpatzig@suse.de + +- update to v3.15: + * Extract main service class for later use. + +------------------------------------------------------------------- Old: ---- bluez-libs-3.14.tar.gz New: ---- bluez-libs-3.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-libs.spec ++++++ --- /var/tmp/diff_new_pack.By8585/_old 2007-08-28 18:41:55.000000000 +0200 +++ /var/tmp/diff_new_pack.By8585/_new 2007-08-28 18:41:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package bluez-libs (Version 3.14) +# spec file for package bluez-libs (Version 3.15) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: bluez-libs URL: http://bluez.sourceforge.net -Version: 3.14 +Version: 3.15 Release: 1 Summary: Bluetooth Libraries License: GPL v2 or later @@ -66,6 +66,9 @@ %doc AUTHORS COPYING INSTALL ChangeLog NEWS README %changelog +* Tue Aug 28 2007 - tpatzig@suse.de +- update to v3.15: + * Extract main service class for later use. * Fri Aug 10 2007 - tpatzig@suse.de - update to v3.14: * Add definitions and functions for Simple Pairing. ++++++ bluez-libs-3.14.tar.gz -> bluez-libs-3.15.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.14/ChangeLog new/bluez-libs-3.15/ChangeLog --- old/bluez-libs-3.14/ChangeLog 2007-08-08 18:05:28.000000000 +0200 +++ new/bluez-libs-3.15/ChangeLog 2007-08-23 11:59:37.000000000 +0200 @@ -1,3 +1,6 @@ +ver 3.15: + Extract main service class for later use. + ver 3.14: Add definitions and functions for Simple Pairing. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.14/configure new/bluez-libs-3.15/configure --- old/bluez-libs-3.14/configure 2007-08-08 18:05:55.000000000 +0200 +++ new/bluez-libs-3.15/configure 2007-08-23 12:00:28.000000000 +0200 @@ -2236,7 +2236,7 @@ # Define the identity of the package. PACKAGE=bluez-libs - VERSION=3.14 + VERSION=3.15 cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.14/configure.in new/bluez-libs-3.15/configure.in --- old/bluez-libs-3.14/configure.in 2007-08-08 18:05:28.000000000 +0200 +++ new/bluez-libs-3.15/configure.in 2007-08-23 11:59:37.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT() -AM_INIT_AUTOMAKE(bluez-libs, 3.14) +AM_INIT_AUTOMAKE(bluez-libs, 3.15) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.14/include/sdp.h new/bluez-libs-3.15/include/sdp.h --- old/bluez-libs-3.14/include/sdp.h 2007-01-28 21:16:42.000000000 +0100 +++ new/bluez-libs-3.15/include/sdp.h 2007-08-23 11:59:37.000000000 +0200 @@ -457,11 +457,12 @@ typedef struct { uint32_t handle; - /* - * Search pattern: a sequence of all UUIDs seen in this record - */ + /* Search pattern: a sequence of all UUIDs seen in this record */ sdp_list_t *pattern; sdp_list_t *attrlist; + + /* Main service class for Extended Inquiry Response */ + uuid_t svclass; } sdp_record_t; typedef struct sdp_data_struct sdp_data_t; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.14/src/Makefile.am new/bluez-libs-3.15/src/Makefile.am --- old/bluez-libs-3.14/src/Makefile.am 2007-08-08 18:05:29.000000000 +0200 +++ new/bluez-libs-3.15/src/Makefile.am 2007-08-23 11:59:37.000000000 +0200 @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libbluetooth.la libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c -libbluetooth_la_LDFLAGS = -version-info 10:0:8 +libbluetooth_la_LDFLAGS = -version-info 10:1:8 INCLUDES = -I$(top_builddir)/include diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.14/src/Makefile.in new/bluez-libs-3.15/src/Makefile.in --- old/bluez-libs-3.14/src/Makefile.in 2007-08-08 18:05:54.000000000 +0200 +++ new/bluez-libs-3.15/src/Makefile.in 2007-08-23 12:00:26.000000000 +0200 @@ -175,7 +175,7 @@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libbluetooth.la libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c -libbluetooth_la_LDFLAGS = -version-info 10:0:8 +libbluetooth_la_LDFLAGS = -version-info 10:1:8 INCLUDES = -I$(top_builddir)/include MAINTAINERCLEANFILES = Makefile.in all: all-am diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.14/src/sdp.c new/bluez-libs-3.15/src/sdp.c --- old/bluez-libs-3.14/src/sdp.c 2007-06-16 13:53:41.000000000 +0200 +++ new/bluez-libs-3.15/src/sdp.c 2007-08-23 11:59:37.000000000 +0200 @@ -574,22 +574,48 @@ return sdp_data_alloc(SDP_SEQ8, seq); } +static void extract_svclass_uuid(sdp_data_t *data, uuid_t *uuid) +{ + sdp_data_t *d; + + if (!data || data->dtd < SDP_SEQ8 || data->dtd > SDP_SEQ32) + return; + + d = data->val.dataseq; + if (!d) + return; + + if (d->dtd < SDP_UUID16 || d->dtd > SDP_UUID128) + return; + + *uuid = d->val.uuid; +} + int sdp_attr_add(sdp_record_t *rec, uint16_t attr, sdp_data_t *d) { sdp_data_t *p = sdp_data_get(rec, attr); if (p) return -1; + d->attrId = attr; rec->attrlist = sdp_list_insert_sorted(rec->attrlist, d, sdp_attrid_comp_func); + + if (attr == SDP_ATTR_SVCLASS_ID_LIST) + extract_svclass_uuid(d, &rec->svclass); + return 0; } void sdp_attr_remove(sdp_record_t *rec, uint16_t attr) { sdp_data_t *d = sdp_data_get(rec, attr); + if (d) rec->attrlist = sdp_list_remove(rec->attrlist, d); + + if (attr == SDP_ATTR_SVCLASS_ID_LIST) + memset(&rec->svclass, 0, sizeof(rec->svclass)); } void sdp_set_seq_len(uint8_t *ptr, uint32_t length) @@ -820,8 +846,12 @@ rec->attrlist = sdp_list_remove(rec->attrlist, p); sdp_data_free(p); } + d->attrId = attr; - rec->attrlist = sdp_list_insert_sorted(rec->attrlist, (void *)d, sdp_attrid_comp_func); + rec->attrlist = sdp_list_insert_sorted(rec->attrlist, d, sdp_attrid_comp_func); + + if (attr == SDP_ATTR_SVCLASS_ID_LIST) + extract_svclass_uuid(d, &rec->svclass); } int sdp_attrid_comp_func(const void *key1, const void *key2) @@ -1114,8 +1144,13 @@ SDPDBG("Terminating extraction of attributes"); break; } + if (attr == SDP_ATTR_RECORD_HANDLE) rec->handle = data->val.uint32; + + if (attr == SDP_ATTR_SVCLASS_ID_LIST) + extract_svclass_uuid(data, &rec->svclass); + extracted += n; p += n; sdp_attr_replace(rec, attr, data); @@ -1215,7 +1250,7 @@ if (p) return (sdp_data_t *)p->data; } - return 0; + return NULL; } /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org