Switch to side-by-side view

--- a/src/DIF/FA/FABase.h
+++ b/src/DIF/FA/FABase.h
@@ -1,17 +1,24 @@
+// The MIT License (MIT)
 //
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-// 
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see http://www.gnu.org/licenses/.
-// 
+// Copyright (c) 2014-2016 Brno University of Technology, PRISTINE project
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 #ifndef FABASE_H_
 #define FABASE_H_
@@ -19,7 +26,9 @@
 //Standard libraries
 #include <omnetpp.h>
 //RINASim libraries
-#include "FAITable.h"
+#include "NFlowTable.h"
+
+extern const char* TIM_FAPENDFLOWS;
 
 class FABase : public cSimpleModule {
   public:
@@ -27,7 +36,12 @@
     FABase();
     virtual ~FABase();
 
+    std::list<Flow*> PendingFlows;
+
     virtual bool receiveAllocateRequest(Flow* flow) = 0;
+    virtual bool receiveMgmtAllocateRequest(Flow* mgmtflow) = 0;
+    virtual bool receiveMgmtAllocateRequest(APNamingInfo src, APNamingInfo dst) = 0;
+    virtual bool receiveMgmtAllocateFinish() = 0;
     virtual void receiveNM1FlowCreated(Flow* flow) = 0;
     //virtual void receiveCreateResponseFlowPositiveFromRibd(Flow* flow) = 0;
     virtual bool receiveCreateFlowRequestFromRibd(Flow* flow) = 0;
@@ -38,11 +52,11 @@
     virtual bool setOriginalAddresses(Flow* flow) = 0;
     virtual bool setNeighborAddresses(Flow* flow) = 0;
 
-    FAITable* getFaiTable() const;
+    NFlowTable* getNFlowTable() const;
     const Address& getMyAddress() const;
 
   protected:
-    FAITable* FaiTable;
+    NFlowTable* N_flowTable;
     Address MyAddress;
 
     //SimpleModule overloads