diff options
| author | Simon Rettberg | 2013-11-12 16:39:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-12 16:39:04 +0100 |
| commit | 080d2c7799e7d2e3a1378bc94c7d530542a75539 (patch) | |
| tree | 4f1f8ce5c697f961dbc53a27669a57297f5e8ea1 /src/server/globals.h | |
| parent | [SERVER] Fix embarrassing deadlock when deleting old images (diff) | |
| parent | tiny fix (diff) | |
| download | dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.gz dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.xz dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.zip | |
Merge branch 'simon' of dnbd3:dnbd3 into simon
Conflicts:
src/server/altservers.c
Diffstat (limited to 'src/server/globals.h')
| -rw-r--r-- | src/server/globals.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/globals.h b/src/server/globals.h index e2de1fb..7d333e0 100644 --- a/src/server/globals.h +++ b/src/server/globals.h @@ -163,6 +163,11 @@ extern int _isProxy; */ extern int _proxyPrivateOnly; +/** + * Read timeout when waiting for data on an uplink + */ +extern int _uplinkTimeout; + void globals_loadConfig(); #endif /* GLOBALS_H_ */ |