core: Fix uninit pointer read in protocol-native

[pulseaudio] / src / pulse / internal.h

diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index d988e1a7376c6d44a78c26eda20b982fe13c00c2..c5084d5f3902a8a95734d8d3ac396ac15a6cf9b1 100644 (file)
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -1,8 +1,6 @@
 #ifndef foointernalhfoo
 #define foointernalhfoo
 
 #ifndef foointernalhfoo
 #define foointernalhfoo
 

-/* $Id$ */
-

 /***
   This file is part of PulseAudio.
 
 /***
   This file is part of PulseAudio.
 


@@ -11,7 +9,7 @@
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published

-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,

   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -30,11 +28,13 @@
 #include <pulse/stream.h>
 #include <pulse/operation.h>
 #include <pulse/subscribe.h>
 #include <pulse/stream.h>
 #include <pulse/operation.h>
 #include <pulse/subscribe.h>

+#include <pulse/ext-device-manager.h>
+#include <pulse/ext-device-restore.h>
+#include <pulse/ext-stream-restore.h>

 
 #include <pulsecore/socket-client.h>
 #include <pulsecore/pstream.h>
 #include <pulsecore/pdispatch.h>
 
 #include <pulsecore/socket-client.h>
 #include <pulsecore/pstream.h>
 #include <pulsecore/pdispatch.h>

-#include <pulsecore/dynarray.h>

 #include <pulsecore/llist.h>
 #include <pulsecore/native-common.h>
 #include <pulsecore/strlist.h>
 #include <pulsecore/llist.h>
 #include <pulsecore/native-common.h>
 #include <pulsecore/strlist.h>


@@ -42,6 +42,10 @@
 #include <pulsecore/memblockq.h>
 #include <pulsecore/hashmap.h>
 #include <pulsecore/refcnt.h>
 #include <pulsecore/memblockq.h>
 #include <pulsecore/hashmap.h>
 #include <pulsecore/refcnt.h>

+#include <pulsecore/time-smoother.h>
+#ifdef HAVE_DBUS
+#include <pulsecore/dbus-util.h>
+#endif

 
 #include "client-conf.h"
 
 
 #include "client-conf.h"
 


@@ -50,6 +54,11 @@
 struct pa_context {
     PA_REFCNT_DECLARE;
 
 struct pa_context {
     PA_REFCNT_DECLARE;
 

+#ifdef HAVE_DBUS
+    pa_dbus_wrap_connection *system_bus;
+    pa_dbus_wrap_connection *session_bus;
+#endif
+

     pa_proplist *proplist;
     pa_mainloop_api* mainloop;
 
     pa_proplist *proplist;
     pa_mainloop_api* mainloop;
 


@@ -57,27 +66,32 @@ struct pa_context {
     pa_pstream *pstream;
     pa_pdispatch *pdispatch;
 
     pa_pstream *pstream;
     pa_pdispatch *pdispatch;
 

-    pa_dynarray *record_streams, *playback_streams;
+    pa_hashmap *record_streams, *playback_streams;

     PA_LLIST_HEAD(pa_stream, streams);
     PA_LLIST_HEAD(pa_operation, operations);
 
     uint32_t version;
     uint32_t ctag;
     uint32_t csyncid;
     PA_LLIST_HEAD(pa_stream, streams);
     PA_LLIST_HEAD(pa_operation, operations);
 
     uint32_t version;
     uint32_t ctag;
     uint32_t csyncid;

-    uint32_t error;
+    int error;

     pa_context_state_t state;
 
     pa_context_notify_cb_t state_callback;
     void *state_userdata;
     pa_context_state_t state;
 
     pa_context_notify_cb_t state_callback;
     void *state_userdata;

-

     pa_context_subscribe_cb_t subscribe_callback;
     void *subscribe_userdata;
     pa_context_subscribe_cb_t subscribe_callback;
     void *subscribe_userdata;

+    pa_context_event_cb_t event_callback;
+    void *event_userdata;

 
     pa_mempool *mempool;
 
 
     pa_mempool *mempool;
 

-    int is_local;
-    int do_autospawn;
-    int autospawn_lock_fd;
+    bool is_local:1;
+    bool do_shm:1;
+    bool server_specified:1;
+    bool no_fail:1;
+    bool do_autospawn:1;
+    bool use_rtclock:1;
+    bool filter_added:1;

     pa_spawn_api spawn_api;
 
     pa_strlist *server_list;
     pa_spawn_api spawn_api;
 
     pa_strlist *server_list;


@@ -87,52 +101,83 @@ struct pa_context {
     pa_client_conf *conf;
 
     uint32_t client_index;
     pa_client_conf *conf;
 
     uint32_t client_index;

+
+    /* Extension specific data */
+    struct {
+        pa_ext_device_manager_subscribe_cb_t callback;
+        void *userdata;
+    } ext_device_manager;
+    struct {
+        pa_ext_device_restore_subscribe_cb_t callback;
+        void *userdata;
+    } ext_device_restore;
+    struct {
+        pa_ext_stream_restore_subscribe_cb_t callback;
+        void *userdata;
+    } ext_stream_restore;

 };
 
 };
 

-#define PA_MAX_WRITE_INDEX_CORRECTIONS 10
+#define PA_MAX_WRITE_INDEX_CORRECTIONS 32

 
 typedef struct pa_index_correction {
     uint32_t tag;
 
 typedef struct pa_index_correction {
     uint32_t tag;

-    int valid;

     int64_t value;
     int64_t value;

-    int absolute, corrupt;
+    bool valid:1;
+    bool absolute:1;
+    bool corrupt:1;

 } pa_index_correction;
 
 } pa_index_correction;
 

+#define PA_MAX_FORMATS (PA_ENCODING_MAX)
+

 struct pa_stream {
     PA_REFCNT_DECLARE;
 struct pa_stream {
     PA_REFCNT_DECLARE;

+    PA_LLIST_FIELDS(pa_stream);
+

     pa_context *context;
     pa_mainloop_api *mainloop;
     pa_context *context;
     pa_mainloop_api *mainloop;

-    PA_LLIST_FIELDS(pa_stream);

 
 

-    pa_proplist *proplist;
-    pa_bool_t manual_buffer_attr;
-    pa_buffer_attr buffer_attr;
+    uint32_t direct_on_input;
+
+    pa_stream_direction_t direction;
+    pa_stream_state_t state;
+    pa_stream_flags_t flags;
+

     pa_sample_spec sample_spec;
     pa_channel_map channel_map;
     pa_sample_spec sample_spec;
     pa_channel_map channel_map;

-    pa_stream_flags_t flags;
+    uint8_t n_formats;
+    pa_format_info *req_formats[PA_MAX_FORMATS];
+    pa_format_info *format;
+
+    pa_proplist *proplist;
+
+    bool channel_valid:1;
+    bool suspended:1;
+    bool corked:1;
+    bool timing_info_valid:1;
+    bool auto_timing_update_requested:1;
+

     uint32_t channel;
     uint32_t syncid;
     uint32_t channel;
     uint32_t syncid;

-    int channel_valid;

     uint32_t stream_index;
     uint32_t stream_index;

-    pa_stream_direction_t direction;
-    pa_stream_state_t state;
-    pa_bool_t buffer_attr_not_ready, timing_info_not_ready;

 
 

-    uint32_t requested_bytes;
+    int64_t requested_bytes;
+    pa_buffer_attr buffer_attr;

 
     uint32_t device_index;
     char *device_name;
 
     uint32_t device_index;
     char *device_name;

-    pa_bool_t suspended;

 
 

+    /* playback */
+    pa_memblock *write_memblock;
+    void *write_data;
+    int64_t latest_underrun_at_index;
+
+    /* recording */

     pa_memchunk peek_memchunk;
     void *peek_data;
     pa_memblockq *record_memblockq;
 
     pa_memchunk peek_memchunk;
     void *peek_data;
     pa_memblockq *record_memblockq;
 

-    int corked;
-

     /* Store latest latency info */
     pa_timing_info timing_info;
     /* Store latest latency info */
     pa_timing_info timing_info;

-    int timing_info_valid;

 
     /* Use to make sure that time advances monotonically */
     pa_usec_t previous_time;
 
     /* Use to make sure that time advances monotonically */
     pa_usec_t previous_time;


@@ -141,16 +186,15 @@ struct pa_stream {
     uint32_t write_index_not_before;
     uint32_t read_index_not_before;
 
     uint32_t write_index_not_before;
     uint32_t read_index_not_before;
 

-    /* Data about individual timing update correctoins */
+    /* Data about individual timing update corrections */

     pa_index_correction write_index_corrections[PA_MAX_WRITE_INDEX_CORRECTIONS];
     int current_write_index_correction;
 
     /* Latency interpolation stuff */
     pa_time_event *auto_timing_update_event;
     pa_index_correction write_index_corrections[PA_MAX_WRITE_INDEX_CORRECTIONS];
     int current_write_index_correction;
 
     /* Latency interpolation stuff */
     pa_time_event *auto_timing_update_event;

-    int auto_timing_update_requested;
+    pa_usec_t auto_timing_interval_usec;

 
 

-    pa_usec_t cached_time;
-    int cached_time_valid;
+    pa_smoother *smoother;

 
     /* Callbacks */
     pa_stream_notify_cb_t state_callback;
 
     /* Callbacks */
     pa_stream_notify_cb_t state_callback;


@@ -169,6 +213,12 @@ struct pa_stream {
     void *moved_userdata;
     pa_stream_notify_cb_t suspended_callback;
     void *suspended_userdata;
     void *moved_userdata;
     pa_stream_notify_cb_t suspended_callback;
     void *suspended_userdata;

+    pa_stream_notify_cb_t started_callback;
+    void *started_userdata;
+    pa_stream_event_cb_t event_callback;
+    void *event_userdata;
+    pa_stream_notify_cb_t buffer_attr_callback;
+    void *buffer_attr_userdata;

 };
 
 typedef void (*pa_operation_cb_t)(void);
 };
 
 typedef void (*pa_operation_cb_t)(void);


@@ -184,6 +234,8 @@ struct pa_operation {
     pa_operation_state_t state;
     void *userdata;
     pa_operation_cb_t callback;
     pa_operation_state_t state;
     void *userdata;
     pa_operation_cb_t callback;

+    void *state_userdata;
+    pa_operation_notify_cb_t state_callback;

 
     void *private; /* some operations might need this */
 };
 
     void *private; /* some operations might need this */
 };


@@ -194,6 +246,10 @@ void pa_command_subscribe_event(pa_pdispatch *pd, uint32_t command, uint32_t tag
 void pa_command_overflow_or_underflow(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 void pa_command_stream_suspended(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 void pa_command_stream_moved(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 void pa_command_overflow_or_underflow(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 void pa_command_stream_suspended(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 void pa_command_stream_moved(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);

+void pa_command_stream_started(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+void pa_command_stream_event(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+void pa_command_client_event(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+void pa_command_stream_buffer_attr(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);

 
 pa_operation *pa_operation_new(pa_context *c, pa_stream *s, pa_operation_cb_t callback, void *userdata);
 void pa_operation_done(pa_operation *o);
 
 pa_operation *pa_operation_new(pa_context *c, pa_stream *s, pa_operation_cb_t callback, void *userdata);
 void pa_operation_done(pa_operation *o);


@@ -206,28 +262,48 @@ void pa_stream_simple_ack_callback(pa_pdispatch *pd, uint32_t command, uint32_t
 void pa_context_fail(pa_context *c, int error);
 int pa_context_set_error(pa_context *c, int error);
 void pa_context_set_state(pa_context *c, pa_context_state_t st);
 void pa_context_fail(pa_context *c, int error);
 int pa_context_set_error(pa_context *c, int error);
 void pa_context_set_state(pa_context *c, pa_context_state_t st);

-int pa_context_handle_error(pa_context *c, uint32_t command, pa_tagstruct *t);
+int pa_context_handle_error(pa_context *c, uint32_t command, pa_tagstruct *t, bool fail);

 pa_operation* pa_context_send_simple_command(pa_context *c, uint32_t command, void (*internal_callback)(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata), void (*cb)(void), void *userdata);
 
 void pa_stream_set_state(pa_stream *s, pa_stream_state_t st);
 
 pa_tagstruct *pa_tagstruct_command(pa_context *c, uint32_t command, uint32_t *tag);
 
 pa_operation* pa_context_send_simple_command(pa_context *c, uint32_t command, void (*internal_callback)(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata), void (*cb)(void), void *userdata);
 
 void pa_stream_set_state(pa_stream *s, pa_stream_state_t st);
 
 pa_tagstruct *pa_tagstruct_command(pa_context *c, uint32_t command, uint32_t *tag);
 

-#define PA_CHECK_VALIDITY(context, expression, error) do { \
-        if (!(expression)) \
+#define PA_CHECK_VALIDITY(context, expression, error)         \
+    do {                                                      \
+        if (!(expression))                                    \

             return -pa_context_set_error((context), (error)); \
             return -pa_context_set_error((context), (error)); \

-} while(0)
-
-
-#define PA_CHECK_VALIDITY_RETURN_ANY(context, expression, error, value) do { \
-        if (!(expression)) { \
-            pa_context_set_error((context), (error)); \
-            return value; \
-        } \
-} while(0)
-
-#define PA_CHECK_VALIDITY_RETURN_NULL(context, expression, error) PA_CHECK_VALIDITY_RETURN_ANY(context, expression, error, NULL)
-
-void pa_init_proplist(pa_proplist *p);
+    } while(false)
+
+#define PA_CHECK_VALIDITY_RETURN_ANY(context, expression, error, value) \
+    do {                                                                \
+        if (!(expression)) {                                            \
+            pa_context_set_error((context), (error));                   \
+            return value;                                               \
+        }                                                               \
+    } while(false)
+
+#define PA_CHECK_VALIDITY_RETURN_NULL(context, expression, error)       \
+    PA_CHECK_VALIDITY_RETURN_ANY(context, expression, error, NULL)
+
+#define PA_FAIL(context, error)                                 \
+    do {                                                        \
+        return -pa_context_set_error((context), (error));       \
+    } while(false)
+
+#define PA_FAIL_RETURN_ANY(context, error, value)      \
+    do {                                               \
+        pa_context_set_error((context), (error));      \
+        return value;                                  \
+    } while(false)
+
+#define PA_FAIL_RETURN_NULL(context, error)     \
+    PA_FAIL_RETURN_ANY(context, error, NULL)
+
+void pa_ext_device_manager_command(pa_context *c, uint32_t tag, pa_tagstruct *t);
+void pa_ext_device_restore_command(pa_context *c, uint32_t tag, pa_tagstruct *t);
+void pa_ext_stream_restore_command(pa_context *c, uint32_t tag, pa_tagstruct *t);
+
+bool pa_mainloop_is_our_api(pa_mainloop_api*m);

 
 #endif
 
 #endif