- fixed bug in ModelNode_getChildWithFc function

11 years ago · 811b8f4572
parent ad090f707e
commit 811b8f4572
1 changed files with 14 additions and 2 deletions
--- a/src/iec61850/server/model/model.c
+++ b/src/iec61850/server/model/model.c
@ -491,8 +491,20 @@ ModelNode_getChildWithFc(ModelNode* self, const char* name, FunctionalConstraint
                   }
               }
               else {
-                   matchingNode = nextNode;
-                   break;
+
+                   if (nextNode->modelType == DataAttributeModelType) {
+                        DataAttribute* da = (DataAttribute*) nextNode;
+
+                        if (da->fc == fc) {
+                          matchingNode = nextNode;
+                          break;
+                        }
+                   }
+                   else {
+                       matchingNode = nextNode;
+                       break;
+                   }
+
               }
           }
       }