Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-27 06:36:37 +02:00
Code Issues Projects Releases Wiki Activity

2015-02-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added support for selecting router number when using Software
	Authority Protocol in 'ripcd/swauthority.cpp' and
	'ripcd/swauthority.h'.
This commit is contained in:
Fred Gleason 2015-02-21 14:19:07 -05:00
parent 0f69e31d95
commit 8f91f7cf07
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -14769,3 +14769,7 @@
* Fixed a bug in 'lib/rdmatrix.cpp' that caused the configuration * Fixed a bug in 'lib/rdmatrix.cpp' that caused the configuration
for 'Software Authority Protocol' to grey out the 'IP Address' for 'Software Authority Protocol' to grey out the 'IP Address'
field when creating a new matrix. field when creating a new matrix.
2015-02-21 Fred Gleason <fredg@paravelsystems.com>
* Added support for selecting router number when using Software
Authority Protocol in 'ripcd/swauthority.cpp' and
'ripcd/swauthority.h'.

15
ripcd/swauthority.cpp
View File

@ -42,6 +42,7 @@ SoftwareAuthority::SoftwareAuthority(RDMatrix *matrix,QObject *parent,const char
swa_porttype=matrix->portType(RDMatrix::Primary); swa_porttype=matrix->portType(RDMatrix::Primary);
swa_ipaddress=matrix->ipAddress(RDMatrix::Primary); swa_ipaddress=matrix->ipAddress(RDMatrix::Primary);
swa_ipport=matrix->ipPort(RDMatrix::Primary); swa_ipport=matrix->ipPort(RDMatrix::Primary);
swa_card=matrix->card();
swa_inputs=0; swa_inputs=0;
swa_outputs=0; swa_outputs=0;
swa_gpis=matrix->gpis(); swa_gpis=matrix->gpis();
@ -124,7 +125,7 @@ void SoftwareAuthority::processCommand(RDMacro *cmd)
emit rmlEcho(cmd); emit rmlEcho(cmd);
return; return;
} }
SendCommand(QString().sprintf("activateroute 1 %d %d", SendCommand(QString().sprintf("activateroute %d %d %d",swa_card,
cmd->arg(2).toInt(),cmd->arg(1).toInt())); cmd->arg(2).toInt(),cmd->arg(1).toInt()));
cmd->acknowledge(true); cmd->acknowledge(true);
emit rmlEcho(cmd); emit rmlEcho(cmd);
@ -294,9 +295,9 @@ void SoftwareAuthority::DispatchCommand()
// Startup Sequence. Get the input and output lists. // Startup Sequence. Get the input and output lists.
// //
if(section=="login successful") { if(section=="login successful") {
sprintf(buffer,"sourcenames 1\x0D\x0A"); // Request Input List sprintf(buffer,"sourcenames %d\x0D\x0A",swa_card); // Request Input List
SendCommand(buffer); SendCommand(buffer);
sprintf(buffer,"destnames 1\x0D\x0A"); // Request Output List sprintf(buffer,"destnames %d\x0D\x0A",swa_card); // Request Output List
SendCommand(buffer); SendCommand(buffer);
return; return;
} }
@ -311,12 +312,12 @@ void SoftwareAuthority::DispatchCommand()
switch(swa_istate) { switch(swa_istate) {
case 0: // No section selected case 0: // No section selected
if(section=="begin sourcenames - 1") { if(section==QString().sprintf("begin sourcenames - %d",swa_card)) {
swa_istate=1; swa_istate=1;
swa_inputs=0; swa_inputs=0;
return; return;
} }
if(section=="begin destnames - 1") { if(section==QString().sprintf("begin destnames - %d",swa_card)) {
swa_istate=2; swa_istate=2;
swa_outputs=0; swa_outputs=0;
return; return;
@ -324,7 +325,7 @@ void SoftwareAuthority::DispatchCommand()
break; break;
case 1: // Source List case 1: // Source List
if(section=="end sourcenames - 1") { if(section==QString().sprintf("end sourcenames - %d",swa_card)) {
swa_istate=0; swa_istate=0;
sql=QString("update MATRICES set ")+ sql=QString("update MATRICES set ")+
QString().sprintf("INPUTS=%d ",swa_inputs)+ QString().sprintf("INPUTS=%d ",swa_inputs)+
@ -367,7 +368,7 @@ void SoftwareAuthority::DispatchCommand()
break; break;
case 2: // Destinations List case 2: // Destinations List
if(section=="end destnames - 1") { if(section==QString().sprintf("end destnames - %d",swa_card)) {
swa_istate=0; swa_istate=0;
sql=QString("update MATRICES set ")+ sql=QString("update MATRICES set ")+
QString().sprintf("OUTPUTS=%d ",swa_outputs)+ QString().sprintf("OUTPUTS=%d ",swa_outputs)+

1
ripcd/swauthority.h
View File

@ -67,6 +67,7 @@ class SoftwareAuthority : public Switcher
QString swa_username; QString swa_username;
QString swa_password; QString swa_password;
int swa_matrix; int swa_matrix;
int swa_card;
int swa_ipport; int swa_ipport;
int swa_inputs; int swa_inputs;
int swa_outputs; int swa_outputs;