diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-18 19:47:20 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-18 19:47:20 +0000 |
| commit | 74c2948c2299773fd3816af43e06e3bdf714ba3a (patch) | |
| tree | 540f82bac3e6105b6fc34cd4b4613c1756a7512b /res | |
| parent | fd471b4a0cbb2abd7b4c8f30fee850cedefedaa1 (diff) | |
Merge in ast_strftime branch, which changes timestamps to be accurate to the microsecond, instead of only to the second
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75706 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/snmp/agent.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/snmp/agent.c b/res/snmp/agent.c index d7d0955b0..6d497183b 100644 --- a/res/snmp/agent.c +++ b/res/snmp/agent.c @@ -575,14 +575,14 @@ static u_char *ast_var_Config(struct variable *vp, oid *name, size_t *length, switch (vp->magic) { case ASTCONFUPTIME: gettimeofday(&tval, NULL); - long_ret = difftime(tval.tv_sec, ast_startuptime) * 100 + tval.tv_usec / 10000; + long_ret = difftime(tval.tv_sec, ast_startuptime.tv_sec) * 100 + tval.tv_usec / 10000 - ast_startuptime.tv_usec / 10000; return (u_char *)&long_ret; case ASTCONFRELOADTIME: gettimeofday(&tval, NULL); - if (ast_lastreloadtime) - long_ret = difftime(tval.tv_sec, ast_lastreloadtime) * 100 + tval.tv_usec / 10000; + if (ast_lastreloadtime.tv_sec) + long_ret = difftime(tval.tv_sec, ast_lastreloadtime.tv_sec) * 100 + tval.tv_usec / 10000 - ast_lastreloadtime.tv_usec / 10000; else - long_ret = difftime(tval.tv_sec, ast_startuptime) * 100 + tval.tv_usec / 10000; + long_ret = difftime(tval.tv_sec, ast_startuptime.tv_sec) * 100 + tval.tv_usec / 10000 - ast_startuptime.tv_usec / 10000; return (u_char *)&long_ret; case ASTCONFPID: long_ret = getpid(); |