Mailinglist Archive: opensuse-commit (1194 mails)
| < Previous | Next > |
commit bluez-utils
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 06 Mar 2008 20:25:14 +0100
- Message-id: <20080306192514.D2989678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package bluez-utils
checked in at Thu Mar 6 20:25:14 CET 2008.
--------
--- bluez-utils/bluez-utils.changes 2008-02-27 20:52:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/bluez-utils/bluez-utils.changes
2008-03-06 11:10:40.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Mar 6 11:10:10 CET 2008 - seife@xxxxxxx
+
+- update to version 3.28:
+ - Add support for role switch for audio service.
+ - Add disconnect timer for audio service.
+ - Add disconnect detection to ALSA plugin.
+ - Add more SBC optimizations.
+ - Fix alignment issue of SDP server.
+ - Remove support for SDP parsing via expat.
+
+-------------------------------------------------------------------
Old:
----
bluez-utils-3.27.tar.bz2
New:
----
bluez-utils-3.28.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez-utils.spec ++++++
--- /var/tmp/diff_new_pack.U15025/_old 2008-03-06 20:23:54.000000000 +0100
+++ /var/tmp/diff_new_pack.U15025/_new 2008-03-06 20:23:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package bluez-utils (Version 3.27)
+# spec file for package bluez-utils (Version 3.28)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,7 +14,7 @@
Name: bluez-utils
BuildRequires: alsa-devel bluez-libs cups dbus-1-devel fuse-devel glib2-devel
gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel hal-devel
libopensync-devel libusb-devel openobex-devel pkgconfig resmgr xorg-x11-devel
Url: http://bluez.sourceforge.net
-Version: 3.27
+Version: 3.28
Release: 1
Summary: Bluetooth Daemons and Utilities
License: GPL v2 or later
@@ -312,6 +312,14 @@
%{_libdir}/bluetooth/bluetoothd-service-audio
%changelog
+* Thu Mar 06 2008 seife@xxxxxxx
+- update to version 3.28:
+ - Add support for role switch for audio service.
+ - Add disconnect timer for audio service.
+ - Add disconnect detection to ALSA plugin.
+ - Add more SBC optimizations.
+ - Fix alignment issue of SDP server.
+ - Remove support for SDP parsing via expat.
* Wed Feb 27 2008 seife@xxxxxxx
- update to version 3.27:
- Update uinput.h with extra key definitions.
++++++ bluez-utils-3.27.tar.bz2 -> bluez-utils-3.28.tar.bz2 ++++++
++++ 1666 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/acinclude.m4 new/bluez-utils-3.28/acinclude.m4
--- old/bluez-utils-3.27/acinclude.m4 2008-02-23 01:30:09.000000000 +0100
+++ new/bluez-utils-3.28/acinclude.m4 2008-03-05 21:17:59.000000000 +0100
@@ -156,11 +156,6 @@
AC_DEFINE(NEED_USB_INTERRUPT_READ, 1, [Define to 1 if you need
the usb_interrupt_read() function.]))
])
-AC_DEFUN([AC_PATH_EXPAT], [
- AC_CHECK_LIB(expat, XML_ParserCreate_MM, expat_found=yes,
expat_found=no)
- AC_CHECK_HEADERS(expat.h, dummy=yes, expat_found=no)
-])
-
AC_DEFUN([AC_PATH_INOTIFY], [
AC_CHECK_LIB(c ,inotify_init, inotify_found=yes, inotify_found=no)
AC_CHECK_HEADERS(sys/inotify.h, dummy=yes, inotify_found=no)
@@ -178,7 +173,6 @@
pie_enable=no
sndfile_enable=${sndfile_found}
inotify_enable=${inotify_found}
- expat_enable=${expat_found}
hal_enable=${hal_found}
usb_enable=${usb_found}
alsa_enable=${alsa_found}
@@ -248,10 +242,6 @@
inotify_enable=${enableval}
])
- AC_ARG_ENABLE(expat, AC_HELP_STRING([--enable-expat], [enable Expat
support]), [
- expat_enable=${enableval}
- ])
-
AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [enable HAL
support]), [
hal_enable=${enableval}
])
@@ -393,14 +383,12 @@
DBUS_LIBS="$DBUS_GLIB_LIBS"
fi
AM_CONDITIONAL(GLIB, true)
- AM_CONDITIONAL(EXPAT, false)
else
AC_SUBST([GLIB_CFLAGS], ['-I$(top_srcdir)/eglib'])
AC_SUBST([GLIB_LIBS], ['$(top_builddir)/eglib/libeglib.la
-ldl'])
AC_SUBST([GMODULE_CFLAGS], [''])
AC_SUBST([GMODULE_LIBS], [''])
AM_CONDITIONAL(GLIB, false)
- AM_CONDITIONAL(EXPAT, test "${expat_enable}" = "yes" && test
"${expat_found}" = "yes")
fi
AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/audio/a2dp.c new/bluez-utils-3.28/audio/a2dp.c
--- old/bluez-utils-3.27/audio/a2dp.c 2008-02-02 00:16:29.000000000 +0100
+++ new/bluez-utils-3.28/audio/a2dp.c 2008-03-05 21:17:59.000000000 +0100
@@ -1100,7 +1100,7 @@
proceed:
connection = dbus_connection_ref(conn);
- avdtp_init();
+ avdtp_init(config);
if (source) {
for (i = 0; i < sbc_srcs; i++)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/audio/audio.conf new/bluez-utils-3.28/audio/audio.conf
--- old/bluez-utils-3.27/audio/audio.conf 2008-02-02 00:16:30.000000000
+0100
+++ new/bluez-utils-3.28/audio/audio.conf 2008-03-05 21:17:59.000000000
+0100
@@ -4,6 +4,9 @@
# particular interface
[General]
+# Switch to master role for incoming connections (defaults to true)
+#Master=true
+
# If we want to disable support for specific services
# Defaults to supporting all implemented services
#Disable=Control,Source
@@ -16,9 +19,9 @@
# service interacts with remote headset devices)
[Headset]
-# Set to true to only support HSP
+# Set to true to support HFP (in addition to HSP only which is the default)
# Defaults to false
-DisableHFP=true
+HFP=false
# HFP Gateway features
# Defaults to false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/audio/avdtp.c new/bluez-utils-3.28/audio/avdtp.c
--- old/bluez-utils-3.27/audio/avdtp.c 2008-02-02 00:16:30.000000000 +0100
+++ new/bluez-utils-3.28/audio/avdtp.c 2008-03-05 21:18:01.000000000 +0100
@@ -2874,7 +2874,7 @@
return TRUE;
}
-static GIOChannel *avdtp_server_socket(void)
+static GIOChannel *avdtp_server_socket(gboolean master)
{
int sock, lm;
struct sockaddr_l2 addr;
@@ -2887,6 +2887,10 @@
}
lm = L2CAP_LM_SECURE;
+
+ if (master)
+ lm |= L2CAP_LM_MASTER;
+
if (setsockopt(sock, SOL_L2CAP, L2CAP_LM, &lm, sizeof(lm)) < 0) {
error("AVDTP server setsockopt: %s (%d)", strerror(errno),
errno);
@@ -2979,12 +2983,24 @@
bacpy(dst, &session->dst);
}
-int avdtp_init(void)
+int avdtp_init(GKeyFile *config)
{
+ GError *err = NULL;
+ gboolean tmp, master = TRUE;
+
if (avdtp_server)
return 0;
- avdtp_server = avdtp_server_socket();
+ tmp = g_key_file_get_boolean(config, "General", "Master",
+ &err);
+ if (err) {
+ debug("audio.conf: %s", err->message);
+ g_error_free(err);
+ err = NULL;
+ } else
+ master = tmp;
+
+ avdtp_server = avdtp_server_socket(master);
if (!avdtp_server)
return -1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/audio/avdtp.h new/bluez-utils-3.28/audio/avdtp.h
--- old/bluez-utils-3.27/audio/avdtp.h 2008-02-02 00:16:30.000000000 +0100
+++ new/bluez-utils-3.28/audio/avdtp.h 2008-03-05 21:18:01.000000000 +0100
@@ -264,5 +264,5 @@
void avdtp_get_peers(struct avdtp *session, bdaddr_t *src, bdaddr_t *dst);
-int avdtp_init(void);
+int avdtp_init(GKeyFile *config);
void avdtp_exit(void);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/audio/control.c new/bluez-utils-3.28/audio/control.c
--- old/bluez-utils-3.27/audio/control.c 2008-02-02 00:16:30.000000000
+0100
+++ new/bluez-utils-3.28/audio/control.c 2008-03-05 21:18:02.000000000
+0100
@@ -309,7 +309,7 @@
return ret;
}
-static GIOChannel *avctp_server_socket(void)
+static GIOChannel *avctp_server_socket(gboolean master)
{
int sock, lm;
struct sockaddr_l2 addr;
@@ -322,6 +322,10 @@
}
lm = L2CAP_LM_SECURE;
+
+ if (master)
+ lm |= L2CAP_LM_MASTER;
+
if (setsockopt(sock, SOL_L2CAP, L2CAP_LM, &lm, sizeof(lm)) < 0) {
error("AVCTP server setsockopt: %s (%d)", strerror(errno),
errno);
close(sock);
@@ -975,13 +979,24 @@
control->session = NULL;
}
-int avrcp_init(DBusConnection *conn)
+int avrcp_init(DBusConnection *conn, GKeyFile *config)
{
sdp_buf_t buf;
+ gboolean tmp, master = TRUE;
+ GError *err = NULL;
if (avctp_server)
return 0;
+ tmp = g_key_file_get_boolean(config, "General", "Master",
+ &err);
+ if (err) {
+ debug("audio.conf: %s", err->message);
+ g_error_free(err);
+ err = NULL;
+ } else
+ master = tmp;
+
connection = dbus_connection_ref(conn);
if (avrcp_tg_record(&buf) < 0) {
@@ -1010,7 +1025,7 @@
return -1;
}
- avctp_server = avctp_server_socket();
+ avctp_server = avctp_server_socket(master);
if (!avctp_server)
return -1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/audio/control.h new/bluez-utils-3.28/audio/control.h
--- old/bluez-utils-3.27/audio/control.h 2008-02-02 00:16:30.000000000
+0100
+++ new/bluez-utils-3.28/audio/control.h 2008-03-05 21:18:02.000000000
+0100
@@ -24,7 +24,7 @@
#define AUDIO_CONTROL_INTERFACE "org.bluez.audio.Control"
-int avrcp_init(DBusConnection *conn);
+int avrcp_init(DBusConnection *conn, GKeyFile *config);
void avrcp_exit(void);
gboolean avrcp_connect(struct device *dev);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/audio/gstrtpsbcpay.c
new/bluez-utils-3.28/audio/gstrtpsbcpay.c
--- old/bluez-utils-3.27/audio/gstrtpsbcpay.c 2008-02-23 01:30:10.000000000
+0100
+++ new/bluez-utils-3.28/audio/gstrtpsbcpay.c 2008-03-05 21:18:02.000000000
+0100
@@ -166,7 +166,6 @@
guint max_payload;
GstBuffer* outbuf;
guint8 *payload_data;
- guint8 *data;
guint frame_count;
guint payload_length;
struct rtp_payload *payload;
@@ -185,6 +184,8 @@
max_payload = MIN(max_payload, available);
frame_count = max_payload / sbcpay->frame_length;
payload_length = frame_count * sbcpay->frame_length;
+ if (payload_length == 0) /* Nothing to send */
+ return GST_FLOW_OK;
outbuf = gst_rtp_buffer_new_allocate(payload_length +
RTP_SBC_PAYLOAD_HEADER_SIZE, 0, 0);
@@ -197,10 +198,9 @@
memset(payload, 0, sizeof(struct rtp_payload));
payload->frame_count = frame_count;
- data = gst_adapter_take(sbcpay->adapter, payload_length);
- memcpy(payload_data + RTP_SBC_PAYLOAD_HEADER_SIZE, data,
- payload_length);
- g_free(data);
+ gst_adapter_copy(sbcpay->adapter, payload_data +
+ RTP_SBC_PAYLOAD_HEADER_SIZE, 0, payload_length);
+ gst_adapter_flush(sbcpay->adapter, payload_length);
GST_BUFFER_TIMESTAMP(outbuf) = sbcpay->timestamp;
GST_DEBUG_OBJECT (sbcpay, "Pushing %d bytes", payload_length);
@@ -219,7 +219,7 @@
sbcpay = GST_RTP_SBC_PAY(payload);
sbcpay->timestamp = GST_BUFFER_TIMESTAMP(buffer);
- gst_adapter_push(sbcpay->adapter, gst_buffer_copy(buffer));
+ gst_adapter_push(sbcpay->adapter, buffer);
available = gst_adapter_available(sbcpay->adapter);
if (available + RTP_SBC_HEADER_TOTAL >=
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/audio/headset.c new/bluez-utils-3.28/audio/headset.c
--- old/bluez-utils-3.27/audio/headset.c 2008-02-23 01:30:11.000000000
+0100
+++ new/bluez-utils-3.28/audio/headset.c 2008-03-05 21:18:02.000000000
+0100
@@ -58,6 +58,8 @@
#include "error.h"
#include "headset.h"
+#define DC_TIMEOUT 3000
+
#define RING_INTERVAL 3000
#define BUF_SIZE 1024
@@ -117,6 +119,8 @@
guint ring_timer;
+ guint dc_timer;
+
char buf[BUF_SIZE];
int data_start;
int data_length;
@@ -1903,6 +1907,11 @@
{
struct headset *hs = dev->headset;
+ if (hs->dc_timer) {
+ g_source_remove(hs->dc_timer);
+ hs->dc_timer = 0;
+ }
+
if (hs->sco) {
g_io_channel_close(hs->sco);
g_io_channel_unref(hs->sco);
@@ -1917,6 +1926,12 @@
dev->headset = NULL;
}
+static gboolean hs_dc_timeout(struct device *dev)
+{
+ headset_set_state(dev, HEADSET_STATE_DISCONNECTED);
+ return FALSE;
+}
+
gboolean headset_cancel_stream(struct device *dev, unsigned int id)
{
struct headset *hs = dev->headset;
@@ -1947,8 +1962,14 @@
pending_connect_finalize(dev);
- if (hs->auto_dc)
- headset_set_state(dev, HEADSET_STATE_DISCONNECTED);
+ if (hs->auto_dc) {
+ if (hs->rfcomm)
+ hs->dc_timer = g_timeout_add(DC_TIMEOUT,
+ (GSourceFunc) hs_dc_timeout,
+ dev);
+ else
+ headset_set_state(dev, HEADSET_STATE_DISCONNECTED);
+ }
return TRUE;
}
@@ -1971,6 +1992,11 @@
return id;
}
+ if (hs->dc_timer) {
+ g_source_remove(hs->dc_timer);
+ hs->dc_timer = 0;
+ }
+
if (hs->state == HEADSET_STATE_CONNECT_IN_PROGRESS)
return connect_cb_new(hs, HEADSET_STATE_PLAYING, cb, user_data);
@@ -2154,11 +2180,18 @@
if (hs->lock)
return TRUE;
- if (hs->auto_dc)
- headset_set_state(dev, HEADSET_STATE_DISCONNECTED);
- else if (hs->state == HEADSET_STATE_PLAYING)
+ if (hs->state == HEADSET_STATE_PLAYING)
headset_set_state(dev, HEADSET_STATE_CONNECTED);
+ if (hs->auto_dc) {
+ if (hs->state == HEADSET_STATE_CONNECTED)
+ hs->dc_timer = g_timeout_add(DC_TIMEOUT,
+ (GSourceFunc) hs_dc_timeout,
+ dev);
+ else
+ headset_set_state(dev, HEADSET_STATE_DISCONNECTED);
+ }
+
return TRUE;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/audio/manager.c new/bluez-utils-3.28/audio/manager.c
--- old/bluez-utils-3.27/audio/manager.c 2008-02-23 01:30:11.000000000
+0100
+++ new/bluez-utils-3.28/audio/manager.c 2008-03-05 21:18:02.000000000
+0100
@@ -1485,7 +1485,7 @@
return TRUE;
}
-static GIOChannel *server_socket(uint8_t *channel)
+static GIOChannel *server_socket(uint8_t *channel, gboolean master)
{
int sock, lm;
struct sockaddr_rc addr;
@@ -1499,6 +1499,10 @@
}
lm = RFCOMM_LM_SECURE;
+
+ if (master)
+ lm |= RFCOMM_LM_MASTER;
+
if (setsockopt(sock, SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm)) < 0) {
error("server setsockopt: %s (%d)", strerror(errno), errno);
close(sock);
@@ -1540,14 +1544,36 @@
{
uint8_t chan = DEFAULT_HS_AG_CHANNEL;
sdp_buf_t buf;
- gboolean no_hfp = FALSE;
+ gboolean hfp = TRUE, master = TRUE;
GError *err = NULL;
uint32_t features;
if (!(enabled.headset || enabled.gateway))
return 0;
- hs_server = server_socket(&chan);
+ if (config) {
+ gboolean tmp;
+
+ tmp = g_key_file_get_boolean(config, "General", "Master",
+ &err);
+ if (err) {
+ debug("audio.conf: %s", err->message);
+ g_error_free(err);
+ err = NULL;
+ } else
+ master = tmp;
+
+ tmp = g_key_file_get_boolean(config, "Headset", "HFP",
+ &err);
+ if (err) {
+ debug("audio.conf: %s", err->message);
+ g_error_free(err);
+ err = NULL;
+ } else
+ hfp = tmp;
+ }
+
+ hs_server = server_socket(&chan, master);
if (!hs_server)
return -1;
@@ -1568,22 +1594,12 @@
g_io_add_watch(hs_server, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
(GIOFunc) ag_io_cb, NULL);
- if (config) {
- no_hfp = g_key_file_get_boolean(config, "Headset", "DisableHFP",
- &err);
- if (err) {
- debug("audio.conf: %s", err->message);
- g_error_free(err);
- err = NULL;
- }
- }
-
- if (no_hfp)
+ if (!hfp)
return 0;
chan = DEFAULT_HF_AG_CHANNEL;
- hf_server = server_socket(&chan);
+ hf_server = server_socket(&chan, master);
if (!hf_server)
return -1;
@@ -1697,7 +1713,7 @@
goto failed;
}
- if (enabled.control && avrcp_init(conn) < 0)
+ if (enabled.control && avrcp_init(conn, config) < 0)
goto failed;
if (!dbus_connection_register_interface(conn, AUDIO_MANAGER_PATH,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/audio/pcm_bluetooth.c
new/bluez-utils-3.28/audio/pcm_bluetooth.c
--- old/bluez-utils-3.27/audio/pcm_bluetooth.c 2008-02-23 01:30:11.000000000
+0100
+++ new/bluez-utils-3.28/audio/pcm_bluetooth.c 2008-03-05 21:18:02.000000000
+0100
@@ -750,6 +750,11 @@
return 0;
}
+static int bluetooth_playback_poll_descriptors_count(snd_pcm_ioplug_t *io)
+{
+ return 2;
+}
+
static int bluetooth_playback_poll_descriptors(snd_pcm_ioplug_t *io,
struct pollfd *pfd, unsigned int space)
{
@@ -759,14 +764,17 @@
assert(data->pipefd[0] >= 0);
- if (space < 1)
+ if (space < 2)
return 0;
pfd[0].fd = data->pipefd[0];
pfd[0].events = POLLIN;
pfd[0].revents = 0;
+ pfd[1].fd = data->stream.fd;
+ pfd[1].events = POLLERR | POLLHUP | POLLNVAL;
+ pfd[1].revents = 0;
- return 1;
+ return 2;
}
static int bluetooth_playback_poll_revents(snd_pcm_ioplug_t *io,
@@ -779,14 +787,19 @@
DBG("");
assert(pfds);
- assert(nfds == 1);
+ assert(nfds == 2);
assert(revents);
assert(pfds[0].fd >= 0);
+ assert(pfds[1].fd >= 0);
if (io->state != SND_PCM_STATE_PREPARED)
ret = read(pfds[0].fd, buf, 1);
- *revents = (pfds[0].revents & ~POLLIN) | POLLOUT;
+ if (pfds[1].revents & (POLLERR | POLLHUP | POLLNVAL))
+ io->state = SND_PCM_STATE_DISCONNECTED;
+
+ revents[0] = (pfds[0].revents & ~POLLIN) | POLLOUT;
+ revents[1] = (pfds[1].revents & ~POLLIN);
return 0;
}
@@ -1087,6 +1100,7 @@
.hw_params = bluetooth_hsp_hw_params,
.prepare = bluetooth_prepare,
.transfer = bluetooth_hsp_write,
+ .poll_descriptors_count = bluetooth_playback_poll_descriptors_count,
.poll_descriptors = bluetooth_playback_poll_descriptors,
.poll_revents = bluetooth_playback_poll_revents,
.delay = bluetooth_playback_delay,
@@ -1112,6 +1126,7 @@
.hw_params = bluetooth_a2dp_hw_params,
.prepare = bluetooth_prepare,
.transfer = bluetooth_a2dp_write,
+ .poll_descriptors_count = bluetooth_playback_poll_descriptors_count,
.poll_descriptors = bluetooth_playback_poll_descriptors,
.poll_revents = bluetooth_playback_poll_revents,
.delay = bluetooth_playback_delay,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/ChangeLog new/bluez-utils-3.28/ChangeLog
--- old/bluez-utils-3.27/ChangeLog 2008-02-23 01:39:15.000000000 +0100
+++ new/bluez-utils-3.28/ChangeLog 2008-03-05 21:19:23.000000000 +0100
@@ -1,3 +1,14 @@
+ver 3.28:
+ Add support for role switch for audio service.
+ Add disconnect timer for audio service.
+ Add disconnect detection to ALSA plugin.
+ Add more SBC optimizations.
+ Fix alignment issue of SDP server.
+ Remove support for SDP parsing via expat.
+
+ Note:
+ This version needs at least bluez-libs-3.28
+
ver 3.27:
Update uinput.h with extra key definitions.
Add support for input connect/disconnect callbacks.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/common/Makefile.am new/bluez-utils-3.28/common/Makefile.am
--- old/bluez-utils-3.27/common/Makefile.am 2007-12-08 20:04:40.000000000
+0100
+++ new/bluez-utils-3.28/common/Makefile.am 2008-03-05 21:29:18.000000000
+0100
@@ -2,12 +2,8 @@
if GLIB
sdp_sources = sdp-glib.c
else
-if EXPAT
-sdp_sources = sdp-expat.c
-else
sdp_sources = sdp-dummy.c
endif
-endif
if HAL
hal_sources = hal-libhal.c
@@ -37,7 +33,6 @@
AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@
EXTRA_DIST = ppoll.h uinput.h hal-dummy.c hal-libhal.c \
- notify-dummy.c notify-inotify.c \
- sdp-dummy.c sdp-expat.c sdp-glib.c
+ notify-dummy.c notify-inotify.c sdp-dummy.c sdp-glib.c
MAINTAINERCLEANFILES = Makefile.in
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/common/sdp-expat.c new/bluez-utils-3.28/common/sdp-expat.c
--- old/bluez-utils-3.27/common/sdp-expat.c 2008-02-10 20:38:27.000000000
+0100
+++ new/bluez-utils-3.28/common/sdp-expat.c 1970-01-01 01:00:00.000000000
+0100
@@ -1,292 +0,0 @@
-/*
- *
- * BlueZ - Bluetooth protocol stack for Linux
- *
- * Copyright (C) 2005-2008 Marcel Holtmann <marcel@xxxxxxxxxxxx>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <limits.h>
-
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
-#include <expat.h>
-
-#include "logging.h"
-#include "sdp-xml.h"
-
-static int compute_seq_size(sdp_data_t *data)
-{
- int unit_size = data->unitSize;
- sdp_data_t *seq = data->val.dataseq;
-
- for (; seq; seq = seq->next)
- unit_size += seq->unitSize;
-
- return unit_size;
-}
-
-/* Expat specific implementation of the context struct */
-
-struct sdp_xml_context {
- XML_Parser parser; /* Parser object being used */
- sdp_record_t *sdprec; /* SDP Record being built */
- struct sdp_xml_data *stack_head; /* Top of the stack of
attributes */
- int attrId; /* Id of the most recently
processed attribute */
-};
-
-static void convert_xml_to_sdp_start(void *data, const char *el, const char
**attr)
-{
- struct sdp_xml_context *context = data;
- int i;
-
- if (!strcmp(el, "record"))
- return;
-
- if (!strcmp(el, "attribute")) {
- /* Get the ID */
- for (i = 0; attr[i]; i += 1) {
- if (!strcmp(attr[i], "id")) {
- context->attrId = strtol(attr[i + 1], 0, 0);
- break;
- }
- }
-
- return;
- }
-
- /* Assume every other tag is an element of some sort */
- if (context->stack_head) {
- struct sdp_xml_data *newelem = sdp_xml_data_alloc();
- newelem->next = context->stack_head;
- context->stack_head = newelem;
- } else {
- context->stack_head = sdp_xml_data_alloc();
- context->stack_head->next = NULL;
- }
-
- if (!strcmp(el, "sequence"))
- context->stack_head->data = sdp_data_alloc(SDP_SEQ8, NULL);
- else if (!strcmp(el, "alternate"))
- context->stack_head->data = sdp_data_alloc(SDP_ALT8, NULL);
- else {
- /* Parse value, name, encoding */
- for (i = 0; attr[i]; i += 2) {
- if (!strcmp(attr[i], "value")) {
- int curlen = strlen(context->stack_head->text);
- int attrlen = strlen(attr[i + 1]);
-
- /* Ensure we're big enough */
- while ((curlen + 1 + attrlen) >
context->stack_head->size) {
-
sdp_xml_data_expand(context->stack_head);
- }
-
- memcpy(&context->stack_head->text[curlen],
- attr[i + 1], attrlen);
- context->stack_head->text[curlen + attrlen] =
'\0';
- }
-
- if (!strcmp(attr[i], "encoding")) {
- if (!strcmp(attr[i + 1], "hex"))
- context->stack_head->type = 1;
- }
-
- if (!strcmp(attr[i], "name")) {
- context->stack_head->name = strdup(attr[i + 1]);
- }
- }
-
- context->stack_head->data = sdp_xml_parse_datatype(el,
- context->stack_head, context->sdprec);
-
- /* Could not parse an entry */
- if (context->stack_head->data == NULL)
- XML_StopParser(context->parser, 0);
- }
-}
-
-static void convert_xml_to_sdp_end(void *data, const char *el)
-{
- struct sdp_xml_context *context = data;
- struct sdp_xml_data *elem;
-
- if (!strcmp(el, "record"))
- return;
-
- if (!strcmp(el, "attribute")) {
- if (context->stack_head && context->stack_head->data) {
- int ret = sdp_attr_add(context->sdprec, context->attrId,
-
context->stack_head->data);
- if (ret == -1)
- debug("Trouble adding attribute\n");
-
- context->stack_head->data = NULL;
- sdp_xml_data_free(context->stack_head);
- context->stack_head = NULL;
- } else {
- debug("No Data for attribute: %d\n", context->attrId);
- }
-
- return;
- } else if (!strcmp(el, "sequence")) {
- context->stack_head->data->unitSize =
compute_seq_size(context->stack_head->data);
-
- if (context->stack_head->data->unitSize > USHRT_MAX) {
- context->stack_head->data->unitSize += sizeof(uint32_t);
- context->stack_head->data->dtd = SDP_SEQ32;
- } else if (context->stack_head->data->unitSize > UCHAR_MAX) {
- context->stack_head->data->unitSize += sizeof(uint16_t);
- context->stack_head->data->dtd = SDP_SEQ16;
- } else {
- context->stack_head->data->unitSize += sizeof(uint8_t);
- }
- } else if (!strcmp(el, "alternate")) {
- context->stack_head->data->unitSize =
compute_seq_size(context->stack_head->data);
-
- if (context->stack_head->data->unitSize > USHRT_MAX) {
- context->stack_head->data->unitSize += sizeof(uint32_t);
- context->stack_head->data->dtd = SDP_ALT32;
- } else if (context->stack_head->data->unitSize > UCHAR_MAX) {
- context->stack_head->data->unitSize += sizeof(uint16_t);
- context->stack_head->data->dtd = SDP_ALT16;
- } else {
- context->stack_head->data->unitSize += sizeof(uint8_t);
- }
- }
-
- /* If we're not inside a seq or alt, then we're inside an attribute
- which will be taken care of later
- */
- if (context->stack_head->next && context->stack_head->data &&
- context->stack_head->next->data) {
- switch (context->stack_head->next->data->dtd) {
- case SDP_SEQ8:
- case SDP_SEQ16:
- case SDP_SEQ32:
- case SDP_ALT8:
- case SDP_ALT16:
- case SDP_ALT32:
- context->stack_head->next->data->val.dataseq =
-
sdp_seq_append(context->stack_head->next->data->val.dataseq,
-
context->stack_head->data);
- context->stack_head->data = NULL;
- break;
- }
-
- elem = context->stack_head;
- context->stack_head = context->stack_head->next;
-
- sdp_xml_data_free(elem);
- }
-}
-
-static struct sdp_xml_context *sdp_xml_init_context()
-{
- struct sdp_xml_context *context;
-
- context = malloc(sizeof(struct sdp_xml_context));
-
- if (!context)
- return NULL;
-
- context->parser = 0;
- context->sdprec = 0;
- context->stack_head = 0;
-
- context->parser = XML_ParserCreate(NULL);
- XML_SetElementHandler(context->parser, convert_xml_to_sdp_start,
- convert_xml_to_sdp_end);
- XML_SetUserData(context->parser, context);
-
- if (!context->parser)
- goto fail;
-
- context->sdprec = sdp_record_alloc();
-
- if (!context->sdprec)
- goto fail;
-
- return context;
-
-fail:
- if (context->parser)
- free(context->parser);
-
- if (context->sdprec)
- sdp_record_free(context->sdprec);
-
- if (context)
- free(context);
-
- return NULL;
-}
-
-static void sdp_xml_free_context(struct sdp_xml_context *context)
-{
- struct sdp_xml_data *elem;
-
- /* Free the stack */
- while (context->stack_head) {
- elem = context->stack_head;
- context->stack_head = elem->next;
- sdp_xml_data_free(elem);
- }
-
- XML_ParserFree(context->parser);
-
- free(context);
-}
-
-static int sdp_xml_parse_chunk(struct sdp_xml_context *context,
- const char *data, int size, int final)
-{
- if (!XML_Parse(context->parser, data, size, final)) {
- error("Parse error at line %d: %s\n",
- XML_GetCurrentLineNumber(context->parser),
- XML_ErrorString(XML_GetErrorCode(context->parser)));
- return -1;
- }
-
- return 0;
-}
-
-sdp_record_t *sdp_xml_parse_record(const char *data, int size)
-{
- struct sdp_xml_context *context;
- sdp_record_t *record;
-
- context = sdp_xml_init_context();
-
- if (sdp_xml_parse_chunk(context, data, size, 1) < 0) {
- sdp_record_free(context->sdprec);
- sdp_xml_free_context(context);
- return NULL;
- }
-
- record = context->sdprec;
-
- sdp_xml_free_context(context);
-
- return record;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/config.h.in new/bluez-utils-3.28/config.h.in
--- old/bluez-utils-3.27/config.h.in 2008-02-23 01:40:37.000000000 +0100
+++ new/bluez-utils-3.28/config.h.in 2008-03-05 21:36:18.000000000 +0100
@@ -9,9 +9,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define to 1 if you have the <expat.h> header file. */
-#undef HAVE_EXPAT_H
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/configure.in new/bluez-utils-3.28/configure.in
--- old/bluez-utils-3.27/configure.in 2008-02-23 01:39:15.000000000 +0100
+++ new/bluez-utils-3.28/configure.in 2008-03-05 21:19:23.000000000 +0100
@@ -1,7 +1,7 @@
AC_PREREQ(2.50)
AC_INIT()
-AM_INIT_AUTOMAKE(bluez-utils, 3.27)
+AM_INIT_AUTOMAKE(bluez-utils, 3.28)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@@ -32,7 +32,6 @@
AC_PATH_GSTREAMER
AC_PATH_HAL
AC_PATH_USB
-AC_PATH_EXPAT
AC_PATH_INOTIFY
AC_PATH_SNDFILE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/cups/Makefile.am new/bluez-utils-3.28/cups/Makefile.am
--- old/bluez-utils-3.27/cups/Makefile.am 2007-06-08 20:48:20.000000000
+0200
+++ new/bluez-utils-3.28/cups/Makefile.am 2008-03-05 21:18:02.000000000
+0100
@@ -8,10 +8,6 @@
bluetooth_LDADD = $(top_builddir)/common/libhelper.a \
@DBUS_LIBS@ @GLIB_LIBS@ @BLUEZ_LIBS@
-
-if EXPAT
-bluetooth_LDADD += -lexpat
-endif
endif
AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/daemon/Makefile.am new/bluez-utils-3.28/daemon/Makefile.am
--- old/bluez-utils-3.27/daemon/Makefile.am 2007-06-24 00:55:58.000000000
+0200
+++ new/bluez-utils-3.28/daemon/Makefile.am 2008-03-05 21:18:02.000000000
+0100
@@ -34,10 +34,6 @@
$(top_builddir)/sdpd/libsdpserver.a \
@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
-if EXPAT
-bluetoothd_LDADD += -lexpat
-endif
-
passkey_agent_SOURCES = passkey-agent.c
passkey_agent_LDADD = @DBUS_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/hcid/Makefile.am new/bluez-utils-3.28/hcid/Makefile.am
--- old/bluez-utils-3.27/hcid/Makefile.am 2007-08-23 11:59:48.000000000
+0200
+++ new/bluez-utils-3.28/hcid/Makefile.am 2008-03-05 21:18:02.000000000
+0100
@@ -31,10 +31,6 @@
$(top_builddir)/sdpd/libsdpserver.a \
$(top_builddir)/common/libhelper.a \
@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
-
-if EXPAT
-hcid_LDADD += -lexpat
-endif
endif
AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/network/manager.h new/bluez-utils-3.28/network/manager.h
--- old/bluez-utils-3.27/network/manager.h 2008-02-02 00:16:33.000000000
+0100
+++ new/bluez-utils-3.28/network/manager.h 2008-03-05 21:18:02.000000000
+0100
@@ -41,6 +41,3 @@
int network_init(DBusConnection *conn, struct network_conf *service_conf);
void network_exit(void);
-
-int network_del_stored_info(bdaddr_t *src, uint16_t uuid);
-int network_store_info(bdaddr_t *src, uint16_t uuid, gboolean enable);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/sbc/Makefile.am new/bluez-utils-3.28/sbc/Makefile.am
--- old/bluez-utils-3.27/sbc/Makefile.am 2007-10-26 01:09:15.000000000
+0200
+++ new/bluez-utils-3.28/sbc/Makefile.am 2008-03-05 21:18:02.000000000
+0100
@@ -10,6 +10,8 @@
libsbc_la_SOURCES = sbc.h sbc.c sbc_math.h sbc_tables.h
+libsbc_la_CFLAGS = -finline-functions -funswitch-loops -fgcse-after-reload
+
noinst_PROGRAMS = sbcinfo sbcdec sbcenc $(sndfile_programs)
sbcdec_LDADD = libsbc.la
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/sbc/sbc.c new/bluez-utils-3.28/sbc/sbc.c
--- old/bluez-utils-3.27/sbc/sbc.c 2008-02-23 01:30:13.000000000 +0100
+++ new/bluez-utils-3.28/sbc/sbc.c 2008-03-05 21:18:02.000000000 +0100
@@ -375,7 +375,7 @@
int ch, sb, blk, bit; /* channel, subband, block and bit standard
counters */
int bits[2][8]; /* bits distribution */
- int levels[2][8]; /* levels derived from that */
+ uint32_t levels[2][8]; /* levels derived from that */
if (len < 4)
return -1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/sbc/sbc_math.h new/bluez-utils-3.28/sbc/sbc_math.h
--- old/bluez-utils-3.27/sbc/sbc_math.h 2008-02-23 01:30:13.000000000 +0100
+++ new/bluez-utils-3.28/sbc/sbc_math.h 2008-03-05 21:18:03.000000000 +0100
@@ -30,16 +30,16 @@
((int32_t)(val)) >> (bits) : ((int32_t) (val)) / (1 << (bits)))
#define SCALE_PROTO4_TBL 15
-#define SCALE_ANA4_TBL 16
+#define SCALE_ANA4_TBL 17
#define SCALE_PROTO8_TBL 16
#define SCALE_ANA8_TBL 17
-#define SCALE_SPROTO4_TBL 15
+#define SCALE_SPROTO4_TBL 12
#define SCALE_SPROTO8_TBL 14
-#define SCALE_NPROTO4_TBL 13
+#define SCALE_NPROTO4_TBL 11
#define SCALE_NPROTO8_TBL 11
-#define SCALE4_STAGE1_BITS 16
-#define SCALE4_STAGE2_BITS 15
-#define SCALE4_STAGED1_BITS 12
+#define SCALE4_STAGE1_BITS 15
+#define SCALE4_STAGE2_BITS 16
+#define SCALE4_STAGED1_BITS 15
#define SCALE4_STAGED2_BITS 16
#define SCALE8_STAGE1_BITS 15
#define SCALE8_STAGE2_BITS 15
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/bluez-utils-3.27/sdpd/request.c new/bluez-utils-3.28/sdpd/request.c
--- old/bluez-utils-3.27/sdpd/request.c 2008-02-10 20:38:33.000000000 +0100
+++ new/bluez-utils-3.28/sdpd/request.c 2008-03-05 21:18:03.000000000 +0100
@@ -179,7 +179,10 @@
pdata += sizeof(uint8_t);
if (cStateSize != 0) {
- sdp_cont_state_t *cstate = (sdp_cont_state_t *)pdata;
+ sdp_cont_state_t *cstate = malloc(sizeof(sdp_cont_state_t));
+ if (!cstate)
+ return NULL;
+ memcpy(cstate, (sdp_cont_state_t *)pdata,
sizeof(sdp_cont_state_t));
debug("Cstate TS : 0x%lx", cstate->timestamp);
debug("Bytes sent : %d", cstate->cStateValue.maxBytesSent);
return cstate;
@@ -408,6 +411,8 @@
}
done:
+ if (cstate)
+ free(cstate);
if (pattern)
sdp_list_free(pattern, free);
@@ -593,6 +598,8 @@
buf->buf_size += sizeof(uint16_t);
done:
+ if (cstate)
+ free(cstate);
if (seq)
sdp_list_free(seq, free);
if (status)
@@ -754,6 +761,8 @@
}
done:
+ if (cstate)
+ free(cstate);
if (tmpbuf.data)
free(tmpbuf.data);
if (pattern)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |