chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
def: centralize definition of default timeout in one place
[elogind.git]
/
src
/
dbus-common.c
diff --git
a/src/dbus-common.c
b/src/dbus-common.c
index bb9cf2e2abfdec0acbc6f354c6456f10b07faafb..e352b8cf996d5475ff9dbf1e096ba9338d1727e3 100644
(file)
--- a/
src/dbus-common.c
+++ b/
src/dbus-common.c
@@
-30,6
+30,7
@@
#include "log.h"
#include "dbus-common.h"
#include "util.h"
#include "log.h"
#include "dbus-common.h"
#include "util.h"
+#include "def.h"
int bus_check_peercred(DBusConnection *c) {
int fd;
int bus_check_peercred(DBusConnection *c) {
int fd;
@@
-57,8
+58,6
@@
int bus_check_peercred(DBusConnection *c) {
return 1;
}
return 1;
}
-#define TIMEOUT_USEC (60*USEC_PER_SEC)
-
static int sync_auth(DBusConnection *bus, DBusError *error) {
usec_t begin, tstamp;
static int sync_auth(DBusConnection *bus, DBusError *error) {
usec_t begin, tstamp;
@@
-71,13
+70,13
@@
static int sync_auth(DBusConnection *bus, DBusError *error) {
begin = tstamp = now(CLOCK_MONOTONIC);
for (;;) {
begin = tstamp = now(CLOCK_MONOTONIC);
for (;;) {
- if (tstamp > begin + TIMEOUT_USEC)
+ if (tstamp > begin +
DEFAULT_
TIMEOUT_USEC)
break;
if (dbus_connection_get_is_authenticated(bus))
break;
break;
if (dbus_connection_get_is_authenticated(bus))
break;
- if (!dbus_connection_read_write_dispatch(bus, ((begin + TIMEOUT_USEC - tstamp) + USEC_PER_MSEC - 1) / USEC_PER_MSEC))
+ if (!dbus_connection_read_write_dispatch(bus, ((begin +
DEFAULT_
TIMEOUT_USEC - tstamp) + USEC_PER_MSEC - 1) / USEC_PER_MSEC))
break;
tstamp = now(CLOCK_MONOTONIC);
break;
tstamp = now(CLOCK_MONOTONIC);