Skip to content

P
proview
Commit daced199 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Remote bugfix for more than 25 remnodes

parent fb28d012
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 12 deletions
remote/exe/rs_remotehandler/src/rs_remotehandler.c
View file @ daced199
...@@ -152,7 +152,8 @@ static void AddTransports() ...@@ -152,7 +152,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
sts = gdh_GetNextObject(objid, &objid); sts = gdh_GetNextObject(objid, &objid);
...@@ -175,7 +176,8 @@ static void AddTransports() ...@@ -175,7 +176,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
sts = gdh_GetNextObject(objid, &objid); sts = gdh_GetNextObject(objid, &objid);
...@@ -199,7 +201,8 @@ static void AddTransports() ...@@ -199,7 +201,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
sts = gdh_GetNextObject(objid, &objid); sts = gdh_GetNextObject(objid, &objid);
...@@ -223,7 +226,8 @@ static void AddTransports() ...@@ -223,7 +226,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
sts = gdh_GetNextObject(objid, &objid); sts = gdh_GetNextObject(objid, &objid);
...@@ -246,7 +250,8 @@ static void AddTransports() ...@@ -246,7 +250,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
sts = gdh_GetNextObject(objid, &objid); sts = gdh_GetNextObject(objid, &objid);
...@@ -269,7 +274,8 @@ static void AddTransports() ...@@ -269,7 +274,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
sts = gdh_GetNextObject(objid, &objid); sts = gdh_GetNextObject(objid, &objid);
...@@ -296,7 +302,8 @@ static void AddTransports() ...@@ -296,7 +302,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
} }
...@@ -319,7 +326,8 @@ static void AddTransports() ...@@ -319,7 +326,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
sts = gdh_GetNextObject(objid, &objid); sts = gdh_GetNextObject(objid, &objid);
...@@ -343,7 +351,8 @@ static void AddTransports() ...@@ -343,7 +351,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
sts = gdh_GetNextObject(objid, &objid); sts = gdh_GetNextObject(objid, &objid);
...@@ -367,7 +376,8 @@ static void AddTransports() ...@@ -367,7 +376,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
sts = gdh_GetNextObject(objid, &objid); sts = gdh_GetNextObject(objid, &objid);
...@@ -389,7 +399,8 @@ static void AddTransports() ...@@ -389,7 +399,8 @@ static void AddTransports()
tp[tpcount].cpid = -1; tp[tpcount].cpid = -1;
tp[tpcount].first = true; tp[tpcount].first = true;
remcfgp->RemNodeObjects[tpcount] = objid; if ( tpcount < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]))
remcfgp->RemNodeObjects[tpcount] = objid;
tpcount++; tpcount++;
sts = gdh_GetNextObject(objid, &objid); sts = gdh_GetNextObject(objid, &objid);
...@@ -527,7 +538,7 @@ int main() ...@@ -527,7 +538,7 @@ int main()
errh_SetStatus(0); errh_SetStatus(0);
exit(1); exit(1);
} }
for (i = 0; i < tpmax; i++) for (i = 0; i < sizeof(remcfgp->RemNodeObjects)/sizeof(remcfgp->RemNodeObjects[0]); i++)
remcfgp->RemNodeObjects[i] = pwr_cNObjid; remcfgp->RemNodeObjects[i] = pwr_cNObjid;
} else { } else {
errh_Info("No RemoteConfig object found, rs_remotehandler will not run"); errh_Info("No RemoteConfig object found, rs_remotehandler will not run");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7