Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-26 22:53:40 +01:00
Code Issues Projects Releases Wiki Activity

2016-08-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed support for the 'HostAddress=' parameter from the
	'rlm_walltime' plug-in in 'rlm/rlm_walltime.c'.
This commit is contained in:
Fred Gleason
2016-08-07 14:23:13 -04:00
parent 6d236f0605
commit 3e1f38c3dc
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -15462,3 +15462,6 @@
* Incremented the package version to 2.15.1. * Incremented the package version to 2.15.1.
2016-08-06 Fred Gleason <fredg@paravelsystems.com> 2016-08-06 Fred Gleason <fredg@paravelsystems.com>
* Refactored 'rlm/rlm_walltime.c' to use http PUTs. * Refactored 'rlm/rlm_walltime.c' to use http PUTs.
2016-08-07 Fred Gleason <fredg@paravelsystems.com>
* Removed support for the 'HostAddress=' parameter from the
'rlm_walltime' plug-in in 'rlm/rlm_walltime.c'.

10
conf/rlm_walltime.conf
View File

@@ -33,12 +33,6 @@ Password=crackme
; ;
FormatString=<body bgcolor="#000000"><table cellspacing="2" cellpadding="2" border="0"><tr><td>&nbsp;</td></tr><tr><td>&nbsp;</td></tr><tr><td><font size="6" color="white">%t</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><font size="5" color="red">%a</font><td></tr></table></body> FormatString=<body bgcolor="#000000"><table cellspacing="2" cellpadding="2" border="0"><tr><td>&nbsp;</td></tr><tr><td>&nbsp;</td></tr><tr><td><font size="6" color="white">%t</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><font size="5" color="red">%a</font><td></tr></table></body>
; Host Address.
;
; The IP address of the Walltime clock unit.
;
HostAddress=192.168.21.21
; Log Selection ; Log Selection
; ;
; Set the status for each log to 'Yes', 'No' or 'Onair' to indicate whether ; Set the status for each log to 'Yes', 'No' or 'Onair' to indicate whether
@@ -47,8 +41,8 @@ HostAddress=192.168.21.21
; is active. ; is active.
; ;
MasterLog=Yes MasterLog=Yes
Aux1Log=Yes Aux1Log=No
Aux2Log=Yes Aux2Log=No
; Additional UDP destinations can be configured by adding new sections... ; Additional UDP destinations can be configured by adding new sections...

9
rlm/rlm_walltime.c
View File

@@ -36,7 +36,6 @@ int rlm_walltime_devs;
char *rlm_walltime_addresses; char *rlm_walltime_addresses;
char *rlm_walltime_passwords; char *rlm_walltime_passwords;
char *rlm_walltime_formats; char *rlm_walltime_formats;
char *rlm_walltime_host_addresses;
int *rlm_walltime_masters; int *rlm_walltime_masters;
int *rlm_walltime_aux1s; int *rlm_walltime_aux1s;
int *rlm_walltime_aux2s; int *rlm_walltime_aux2s;
@@ -81,7 +80,6 @@ void rlm_walltime_RLMStart(void *ptr,const char *arg)
rlm_walltime_addresses=NULL; rlm_walltime_addresses=NULL;
rlm_walltime_passwords=NULL; rlm_walltime_passwords=NULL;
rlm_walltime_formats=NULL; rlm_walltime_formats=NULL;
rlm_walltime_host_addresses=NULL;
rlm_walltime_masters=NULL; rlm_walltime_masters=NULL;
rlm_walltime_aux1s=NULL; rlm_walltime_aux1s=NULL;
rlm_walltime_aux2s=NULL; rlm_walltime_aux2s=NULL;
@@ -102,10 +100,6 @@ void rlm_walltime_RLMStart(void *ptr,const char *arg)
rlm_walltime_formats=realloc(rlm_walltime_formats,(rlm_walltime_devs+1)*8192); rlm_walltime_formats=realloc(rlm_walltime_formats,(rlm_walltime_devs+1)*8192);
strncpy(rlm_walltime_formats+8192*rlm_walltime_devs, strncpy(rlm_walltime_formats+8192*rlm_walltime_devs,
RLMGetStringValue(ptr,arg,section,"FormatString",""),8192); RLMGetStringValue(ptr,arg,section,"FormatString",""),8192);
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_masters=realloc(rlm_walltime_masters,
(rlm_walltime_devs+1)*sizeof(int)); (rlm_walltime_devs+1)*sizeof(int));
rlm_walltime_masters[rlm_walltime_devs]= rlm_walltime_masters[rlm_walltime_devs]=
@@ -133,7 +127,6 @@ void rlm_walltime_RLMFree(void *ptr)
free(rlm_walltime_addresses); free(rlm_walltime_addresses);
free(rlm_walltime_passwords); free(rlm_walltime_passwords);
free(rlm_walltime_formats); free(rlm_walltime_formats);
free(rlm_walltime_host_addresses);
free(rlm_walltime_masters); free(rlm_walltime_masters);
free(rlm_walltime_aux1s); free(rlm_walltime_aux1s);
free(rlm_walltime_aux2s); free(rlm_walltime_aux2s);
@@ -181,7 +174,7 @@ void rlm_walltime_RLMPadDataSent(void *ptr,const struct rlm_svc *svc,
} }
fclose(f); fclose(f);
snprintf(url,1024,"http://%s/webwidget", snprintf(url,1024,"http://%s/webwidget",
rlm_walltime_host_addresses+16*i); rlm_walltime_addresses+16*i);
snprintf(password,1024,"user:%s",rlm_walltime_passwords+1024*i); snprintf(password,1024,"user:%s",rlm_walltime_passwords+1024*i);
if(fork()==0) { if(fork()==0) {
execlp("curl","curl","-u",password,"-o","/dev/null","-s","-T", execlp("curl","curl","-u",password,"-o","/dev/null","-s","-T",