summaryrefslogtreecommitdiff
path: root/src/sbus
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-03-10 15:27:59 -0500
committerStephen Gallagher <sgallagh@redhat.com>2010-03-15 11:12:56 -0400
commit9fbf00c7802719becd633ecbc45879d5d0ddb985 (patch)
treec38722bd78d605b26d76c24d6c13bd45bc0936bf /src/sbus
parent065b4307c33407e28f28fdba1aee2747b88b0984 (diff)
downloadsssd-9fbf00c7802719becd633ecbc45879d5d0ddb985.tar.gz
sssd-9fbf00c7802719becd633ecbc45879d5d0ddb985.tar.bz2
sssd-9fbf00c7802719becd633ecbc45879d5d0ddb985.zip
Properly handle dbus send attempts on a closed connection
dbus_connection_send_with_reply() will report success and return a NULL pending_reply when the connection is not open for communication. This patch creates a new wrapper around dbus_connection_send_with_reply() to properly detect this condition and report it as an error.
Diffstat (limited to 'src/sbus')
-rw-r--r--src/sbus/sssd_dbus.h16
-rw-r--r--src/sbus/sssd_dbus_connection.c65
2 files changed, 81 insertions, 0 deletions
diff --git a/src/sbus/sssd_dbus.h b/src/sbus/sssd_dbus.h
index ac02c444..2dbf4ab7 100644
--- a/src/sbus/sssd_dbus.h
+++ b/src/sbus/sssd_dbus.h
@@ -144,6 +144,22 @@ DBusHandlerResult sbus_message_handler(DBusConnection *conn,
DBusMessage *message,
void *user_data);
+/*
+ * Send a message across the SBUS
+ * If requested, the DBusPendingCall object will
+ * be returned to the caller.
+ *
+ * This function will return EAGAIN in the event
+ * that the connection is not open for
+ * communication.
+ */
+int sbus_conn_send(struct sbus_connection *conn,
+ DBusMessage *msg,
+ int timeout_ms,
+ DBusPendingCallNotifyFunction reply_handler,
+ void *pvt,
+ DBusPendingCall **pending);
+
void sbus_conn_send_reply(struct sbus_connection *conn,
DBusMessage *reply);
diff --git a/src/sbus/sssd_dbus_connection.c b/src/sbus/sssd_dbus_connection.c
index 38ccc6ab..d2918fbc 100644
--- a/src/sbus/sssd_dbus_connection.c
+++ b/src/sbus/sssd_dbus_connection.c
@@ -685,6 +685,71 @@ bool sbus_conn_disconnecting(struct sbus_connection *conn)
return false;
}
+/*
+ * Send a message across the SBUS
+ * If requested, the DBusPendingCall object will
+ * be returned to the caller.
+ *
+ * This function will return EAGAIN in the event
+ * that the connection is not open for
+ * communication.
+ */
+int sbus_conn_send(struct sbus_connection *conn,
+ DBusMessage *msg,
+ int timeout_ms,
+ DBusPendingCallNotifyFunction reply_handler,
+ void *pvt,
+ DBusPendingCall **pending)
+{
+ DBusPendingCall *pending_reply;
+ DBusConnection *dbus_conn;
+ dbus_bool_t dbret;
+
+ dbus_conn = sbus_get_connection(conn);
+
+ dbret = dbus_connection_send_with_reply(dbus_conn, msg,
+ &pending_reply,
+ timeout_ms);
+ if (!dbret) {
+ /*
+ * Critical Failure
+ * Insufficient memory to send message
+ */
+ DEBUG(0, ("D-BUS send failed.\n"));
+ return ENOMEM;
+ }
+
+ if (pending_reply) {
+ /* Set up the reply handler */
+ dbret = dbus_pending_call_set_notify(pending_reply, reply_handler,
+ pvt, NULL);
+ if (!dbret) {
+ /*
+ * Critical Failure
+ * Insufficient memory to create pending call notify
+ */
+ DEBUG(0, ("D-BUS send failed.\n"));
+ dbus_pending_call_cancel(pending_reply);
+ dbus_pending_call_unref(pending_reply);
+ return ENOMEM;
+ }
+
+ if(pending) {
+ *pending = pending_reply;
+ }
+ return EOK;
+ }
+
+ /* If pending_reply is NULL, the connection was not
+ * open for sending.
+ */
+
+ /* TODO: Create a callback into the reconnection logic so this
+ * request is invoked when the connection is re-established
+ */
+ return EAGAIN;
+}
+
void sbus_conn_send_reply(struct sbus_connection *conn, DBusMessage *reply)
{
dbus_connection_send(conn->dbus.conn, reply, NULL);