From 1d32d1d120d6618550b4823ed44a2970b00c1e33 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sat, 23 Apr 2016 12:33:13 -0400 Subject: [PATCH] 2016-04-23 Fred Gleason * Renamed the 'ClockAddress' parameter to 'HostAddress' in 'rlm/rlm_walltime.c'. --- ChangeLog | 3 +++ conf/rlm_walltime.conf | 6 +++--- rlm/rlm_walltime.c | 23 +++++++++-------------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8afdef8a..bef54b06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15072,3 +15072,6 @@ 'acinclude.m4'. 2016-04-17 Fred Gleason * Added an 'rlm_walltime' RLM in 'rlm/rlm_walltime.c'. +2016-04-23 Fred Gleason + * Renamed the 'ClockAddress' parameter to 'HostAddress' in + 'rlm/rlm_walltime.c'. diff --git a/conf/rlm_walltime.conf b/conf/rlm_walltime.conf index 81482b51..d8c047b6 100644 --- a/conf/rlm_walltime.conf +++ b/conf/rlm_walltime.conf @@ -16,7 +16,7 @@ ; IP Address ; -; The IP address of the remote UDP port, in dotted-quad notation. +; The IP address of the Walltime clock, in dotted-quad notation. IpAddress=192.168.21.100 ; UDP Port @@ -33,11 +33,11 @@ UdpPort=6060 ; FormatString=
 
 
%t>
 
%a
-; Clock Address. +; Host Address. ; ; The IP address of the Walltime clock unit. ; -ClockAddress=192.168.21.123 +HostAddress=192.168.21.21 ; Log Selection ; diff --git a/rlm/rlm_walltime.c b/rlm/rlm_walltime.c index 154cd692..2736d770 100644 --- a/rlm/rlm_walltime.c +++ b/rlm/rlm_walltime.c @@ -34,7 +34,7 @@ int rlm_walltime_devs; char *rlm_walltime_addresses; uint16_t *rlm_walltime_ports; char *rlm_walltime_formats; -char *rlm_walltime_clock_addresses; +char *rlm_walltime_host_addresses; int *rlm_walltime_masters; int *rlm_walltime_aux1s; int *rlm_walltime_aux2s; @@ -79,7 +79,7 @@ void rlm_walltime_RLMStart(void *ptr,const char *arg) rlm_walltime_addresses=NULL; rlm_walltime_ports=NULL; rlm_walltime_formats=NULL; - rlm_walltime_clock_addresses=NULL; + rlm_walltime_host_addresses=NULL; rlm_walltime_masters=NULL; rlm_walltime_aux1s=NULL; rlm_walltime_aux2s=NULL; @@ -100,15 +100,10 @@ void rlm_walltime_RLMStart(void *ptr,const char *arg) rlm_walltime_formats=realloc(rlm_walltime_formats,(rlm_walltime_devs+1)*8192); strncpy(rlm_walltime_formats+8192*rlm_walltime_devs, RLMGetStringValue(ptr,arg,section,"FormatString",""),8192); - - - rlm_walltime_clock_addresses= - realloc(rlm_walltime_clock_addresses,(rlm_walltime_devs+1)*(rlm_walltime_devs+1)*16); - strncpy(rlm_walltime_clock_addresses+16*rlm_walltime_devs, - RLMGetStringValue(ptr,arg,section,"ClockAddress",""),15); - - - + rlm_walltime_host_addresses= + realloc(rlm_walltime_host_addresses,(rlm_walltime_devs+1)*(rlm_walltime_devs+1)*16); + strncpy(rlm_walltime_host_addresses+16*rlm_walltime_devs, + RLMGetStringValue(ptr,arg,section,"HostAddress",""),15); rlm_walltime_masters=realloc(rlm_walltime_masters, (rlm_walltime_devs+1)*sizeof(int)); rlm_walltime_masters[rlm_walltime_devs]= @@ -137,7 +132,7 @@ void rlm_walltime_RLMFree(void *ptr) free(rlm_walltime_addresses); free(rlm_walltime_ports); free(rlm_walltime_formats); - free(rlm_walltime_clock_addresses); + free(rlm_walltime_host_addresses); free(rlm_walltime_masters); free(rlm_walltime_aux1s); free(rlm_walltime_aux2s); @@ -173,14 +168,14 @@ void rlm_walltime_RLMPadDataSent(void *ptr,const struct rlm_svc *svc, if(now->rlm_len==0) { snprintf(timer,1500, "SP!RS!WU http://%s/walltime/walltime.html!", - rlm_walltime_clock_addresses+16*i); + rlm_walltime_host_addresses+16*i); fprintf(f," "); } else { snprintf(timer,1500, "SM D!PS %d!ST!WU http://%s/walltime/walltime.html!", now->rlm_len/1000, - rlm_walltime_clock_addresses+16*i); + rlm_walltime_host_addresses+16*i); fprintf(f,"%s\n", RLMResolveNowNextEncoded(ptr,now,next,rlm_walltime_formats+8192*i, RLM_ENCODE_XML));