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.c | |
| 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.c')
| -rw-r--r-- | src/server/globals.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/globals.c b/src/server/globals.c index 4f081c7..3fcb61d 100644 --- a/src/server/globals.c +++ b/src/server/globals.c @@ -14,6 +14,7 @@ int _serverPenalty = 0; int _clientPenalty = 0; int _isProxy = FALSE; int _proxyPrivateOnly = FALSE; +int _uplinkTimeout = 1250; #define SAVE_TO_VAR_STR(ss, kk) do { if (strcmp(section, #ss) == 0 && strcmp(key, #kk) == 0) { if (_ ## kk != NULL) free(_ ## kk); _ ## kk = strdup(value); } } while (0) #define SAVE_TO_VAR_BOOL(ss, kk) do { if (strcmp(section, #ss) == 0 && strcmp(key, #kk) == 0) _ ## kk = atoi(value) != 0 || strcmp(value, "true") == 0 || strcmp(value, "True") == 0 || strcmp(value, "TRUE") == 0; } while (0) @@ -27,6 +28,7 @@ static int ini_handler(void *custom, const char* section, const char* key, const SAVE_TO_VAR_BOOL( dnbd3, proxyPrivateOnly ); SAVE_TO_VAR_INT( dnbd3, serverPenalty ); SAVE_TO_VAR_INT( dnbd3, clientPenalty ); + SAVE_TO_VAR_INT( dnbd3, uplinkTimeout ); return TRUE; } |