Add a name displayed by frm_gui to the manager

[frescor/fwp.git] / fwp / mngr / fwp_mngr.c

diff --git a/fwp/mngr/fwp_mngr.c b/fwp/mngr/fwp_mngr.c
index 39ca31de7dafa785bf6bdba7432765843e367195..4d21f2f0c3bc1f440d05f1be3c1f2c72fdc72ba2 100644 (file)
--- a/fwp/mngr/fwp_mngr.c
+++ b/fwp/mngr/fwp_mngr.c
@@ -1,3 +1,48 @@
+/**************************************************************************/
+/* ---------------------------------------------------------------------- */
+/* Copyright (C) 2006 - 2008 FRESCOR consortium partners:                */
+/*                                                                       */
+/*   Universidad de Cantabria,              SPAIN                        */
+/*   University of York,                    UK                           */
+/*   Scuola Superiore Sant'Anna,            ITALY                        */
+/*   Kaiserslautern University,             GERMANY                      */
+/*   Univ. Politécnica  Valencia,           SPAIN                       */
+/*   Czech Technical University in Prague,  CZECH REPUBLIC               */
+/*   ENEA                                   SWEDEN                       */
+/*   Thales Communication S.A.              FRANCE                       */
+/*   Visual Tools S.A.                      SPAIN                        */
+/*   Rapita Systems Ltd                     UK                           */
+/*   Evidence                               ITALY                        */
+/*                                                                       */
+/*   See http://www.frescor.org for a link to partners' websites         */
+/*                                                                       */
+/*          FRESCOR project (FP6/2005/IST/5-034026) is funded            */
+/*       in part by the European Union Sixth Framework Programme         */
+/*       The European Union is not liable of any use that may be         */
+/*       made of this code.                                              */
+/*                                                                       */
+/*                                                                       */
+/*  This file is part of FWP (Frescor WLAN Protocol)                     */
+/*                                                                       */
+/* FWP is free software; you can redistribute it and/or modify it        */
+/* under terms of the GNU General Public License as published by the     */
+/* Free Software Foundation; either version 2, or (at your option) any   */
+/* later version.  FWP 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   */
+/* General Public License for more details. You should have received a   */
+/* copy of the GNU General Public License along with FWP; see file       */
+/* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,  */
+/* Cambridge, MA 02139, USA.                                             */
+/*                                                                       */
+/* As a special exception, including FWP header files in a file,         */
+/* instantiating FWP generics or templates, or linking other files       */
+/* with FWP objects to produce an executable application, does not       */
+/* by itself cause the resulting executable application to be covered    */
+/* by the GNU General Public License. This exception does not            */
+/* however invalidate any other reasons why the executable file might be  */
+/* covered by the GNU Public License.                                    */
+/**************************************************************************/
 #include <frm_generic.h>
 #include <forb.h>
 #include <error.h>
@@ -5,10 +50,11 @@
 #include <fres_sa_scenario.h>
 #include <stdbool.h>
 #include <ul_log.h>
-#include <frsh_distributed.h>
-#include "res_dummy.h"
+#include <fwp_res.h>
 #include <stdio.h>
+#include "fwp_admctrl.h"
 
+static
 int dummy_admission_test(struct fres_sa_scenario *scenario, void *priv, 
                                bool *schedulable)
 {
@@ -16,7 +62,7 @@ int dummy_admission_test(struct fres_sa_scenario *scenario, void *priv,
 
        printf("Dummy admission test:\n");
 
-       fres_sa_scenario_for_each_contract(scenario, c) {
+       fres_sa_scenario_for_each_no_cancel_contract(scenario, c) {
                fres_block_basic *basic;
                char id[40];
                fres_contract_id_to_string(id, &c->contract->id, sizeof(id));
@@ -37,7 +83,9 @@ int dummy_admission_test(struct fres_sa_scenario *scenario, void *priv,
 static const struct fres_res_manager frm = {
        .res_type = FRSH_RT_NETWORK,
        .res_id = FRSH_NETPF_FWP,
-       .admission_test = dummy_admission_test,
+       //.admission_test = dummy_admission_test,
+       .name = "WLAN",
+       .admission_test = fwp_admctrl_utilization,
        .priv = NULL
 };
 
@@ -46,9 +94,11 @@ int main(int argc, char *argv[])
        forb_orb orb;
        int ret;
 
-       orb = forb_init(&argc, &argv, "frm_fwp");
+       forb_init_attr_t attr = { .orb_id = "org.frescor.frm.fwp" };
+       orb = forb_init(&argc, &argv, &attr);
        if (!orb) error(1, errno, "forb_init");
-
+       
+       fres_block_register_fwp();
        ret = frm_register_and_run(orb, &frm);
 
        if (ret != 0) {