From c51cb2143b693030ff02feb97bfb26c5e5756ee1 Mon Sep 17 00:00:00 2001 From: hrizi <hrizi@eurecom.fr> Date: Mon, 18 Aug 2014 09:47:54 +0000 Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5726 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- .../RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb.h | 47 +++--- .../LTE_RAL_ENB/INCLUDE/lteRALenb_action.h | 52 +++---- .../LTE_RAL_ENB/INCLUDE/lteRALenb_constants.h | 48 +++--- .../LTE_RAL_ENB/INCLUDE/lteRALenb_main.h | 52 +++---- .../LTE_RAL_ENB/INCLUDE/lteRALenb_mih_msg.h | 52 +++---- .../INCLUDE/lteRALenb_parameters.h | 52 +++---- .../LTE_RAL_ENB/INCLUDE/lteRALenb_process.h | 52 +++---- .../LTE_RAL_ENB/INCLUDE/lteRALenb_proto.h | 44 +++--- .../LTE_RAL_ENB/INCLUDE/lteRALenb_rrc_msg.h | 52 +++---- .../LTE_RAL_ENB/INCLUDE/lteRALenb_subscribe.h | 52 +++---- .../INCLUDE/lteRALenb_thresholds.h | 52 +++---- .../LTE_RAL_ENB/INCLUDE/lteRALenb_variables.h | 48 +++--- .../RAL-LTE/LTE_RAL_ENB/INCLUDE/rrc_d_types.h | 36 ++++- .../MIH-USER/lte_test_user/rg_mih_usr.cpp | 44 ++++-- .../LTE_RAL_ENB/SRC/lteRALenb_action.c | 145 ++++++++++++------ .../RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_main.c | 7 +- .../LTE_RAL_ENB/SRC/lteRALenb_mih_msg.c | 6 + 17 files changed, 477 insertions(+), 364 deletions(-) diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb.h index 193ec71c10f..cf8a2ed91e5 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb.h @@ -1,22 +1,31 @@ -/***************************************************************************** - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * Source lteRALenb.h - * - * Version 0.1 - * - * Date 11/18/2013 - * - * Product MIH RAL LTE - * - * Subsystem RAL-LTE - * - * Authors Michelle Wetterwald, Lionel Gauthier, Frederic Maurel - * - * Description Header file to be included by any module that wants to interface with RAL ENB. - * - *****************************************************************************/ +/******************************************************************************* + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + + *******************************************************************************/ #ifndef __LTE_RAL_ENB_H__ #define __LTE_RAL_ENB_H__ diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_action.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_action.h index cdd523de164..7323d3d08f4 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_action.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_action.h @@ -1,30 +1,30 @@ /******************************************************************************* - * - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * - * The full GNU General Public License is included in this distribution in - * the file called "COPYING". - * - * Contact Information - * Openair Admin: openair_admin@eurecom.fr - * Openair Tech : openair_tech@eurecom.fr - * Forums : http://forums.eurecom.fsr/openairinterface - * Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France - * + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + *******************************************************************************/ /*! \file lteRALenb_action.h * \brief diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_constants.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_constants.h index bf13e10cfc9..a621d9d57f9 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_constants.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_constants.h @@ -1,23 +1,31 @@ -/***************************************************************************** - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * Source lteRALenb_constants.h - * - * Version 0.1 - * - * Date 06/26/2012 - * - * Product MIH RAL LTE - * - * Subsystem RAL-LTE constants - * - * Authors Michelle Wetterwald, Lionel Gauthier, Frederic Maurel - * - * Description Defines constants used by the RAL-LTE process at the network - * side. - * - *****************************************************************************/ +/******************************************************************************* + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + + *******************************************************************************/ #ifndef __LTE_RAL_ENB_CONSTANTS_H__ #define __LTE_RAL_ENB_CONSTANTS_H__ diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_main.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_main.h index 907624b4063..be9c5e9cfdf 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_main.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_main.h @@ -1,30 +1,30 @@ /******************************************************************************* - * - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * - * The full GNU General Public License is included in this distribution in - * the file called "COPYING". - * - * Contact Information - * Openair Admin: openair_admin@eurecom.fr - * Openair Tech : openair_tech@eurecom.fr - * Forums : http://forums.eurecom.fsr/openairinterface - * Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France - * + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + *******************************************************************************/ /*! \file lteRALenb_main.h * \brief diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_mih_msg.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_mih_msg.h index ade575f2691..8b6c11958ca 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_mih_msg.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_mih_msg.h @@ -1,30 +1,30 @@ /******************************************************************************* - * - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * - * The full GNU General Public License is included in this distribution in - * the file called "COPYING". - * - * Contact Information - * Openair Admin: openair_admin@eurecom.fr - * Openair Tech : openair_tech@eurecom.fr - * Forums : http://forums.eurecom.fsr/openairinterface - * Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France - * + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + *******************************************************************************/ /*! \file lteRALenb_mih_msg.h * \brief diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_parameters.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_parameters.h index 637a5a34270..d7b434cec96 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_parameters.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_parameters.h @@ -1,30 +1,30 @@ /******************************************************************************* - * - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * - * The full GNU General Public License is included in this distribution in - * the file called "COPYING". - * - * Contact Information - * Openair Admin: openair_admin@eurecom.fr - * Openair Tech : openair_tech@eurecom.fr - * Forums : http://forums.eurecom.fsr/openairinterface - * Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France - * + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + *******************************************************************************/ /*! \file lteRALenb_parameters.h * \brief diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_process.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_process.h index 36b41a771f6..8fa3de0b8f7 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_process.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_process.h @@ -1,30 +1,30 @@ /******************************************************************************* - * - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * - * The full GNU General Public License is included in this distribution in - * the file called "COPYING". - * - * Contact Information - * Openair Admin: openair_admin@eurecom.fr - * Openair Tech : openair_tech@eurecom.fr - * Forums : http://forums.eurecom.fsr/openairinterface - * Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France - * + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + *******************************************************************************/ /*! \file lteRALenb_process.h * \brief diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_proto.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_proto.h index 80ee73446a0..3649e91130f 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_proto.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_proto.h @@ -1,31 +1,31 @@ -/*************************************************************************** - lteRALenb_proto.h - description - *************************************************************************** - Eurecom OpenAirInterface 3 - Copyright(c) 1999 - 2013 Eurecom +/******************************************************************************* + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom - This program is free software; you can redistribute it and/or modify it - under the terms and conditions of the GNU General Public License, - version 2, as published by the Free Software Foundation. + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 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 - this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + OpenAirInterface 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. - The full GNU General Public License is included in this distribution in - the file called "COPYING". + You should have received a copy of the GNU General Public License + along with OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. Contact Information - Openair Admin: openair_admin@eurecom.fr - Openair Tech : openair_tech@eurecom.fr - Forums : http://forums.eurecom.fsr/openairinterface - Address : Eurecom, 450 route des Chappes, 06410 Biot Sophia Antipolis, France -*******************************************************************************/ + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + + *******************************************************************************/ /*! \file lteRALenb_proto.h * \brief This file defines the prototypes of the common functions * \author WETTERWALD Michelle, GAUTHIER Lionel, MAUREL Frederic diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_rrc_msg.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_rrc_msg.h index 725d6b08d7a..82837d046e6 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_rrc_msg.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_rrc_msg.h @@ -1,30 +1,30 @@ /******************************************************************************* - * - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * - * The full GNU General Public License is included in this distribution in - * the file called "COPYING". - * - * Contact Information - * Openair Admin: openair_admin@eurecom.fr - * Openair Tech : openair_tech@eurecom.fr - * Forums : http://forums.eurecom.fsr/openairinterface - * Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France - * + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + *******************************************************************************/ /*! \file lteRALenb_rrc_msg.h * \brief diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_subscribe.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_subscribe.h index 415dc2cad5c..6bdfc70672d 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_subscribe.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_subscribe.h @@ -1,30 +1,30 @@ /******************************************************************************* - * - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * - * The full GNU General Public License is included in this distribution in - * the file called "COPYING". - * - * Contact Information - * Openair Admin: openair_admin@eurecom.fr - * Openair Tech : openair_tech@eurecom.fr - * Forums : http://forums.eurecom.fsr/openairinterface - * Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France - * + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + *******************************************************************************/ /*! \file lteRALenb_subscribe.h * \brief diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_thresholds.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_thresholds.h index 0c48c13614a..19346fbf0ba 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_thresholds.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_thresholds.h @@ -1,30 +1,30 @@ /******************************************************************************* - * - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * - * The full GNU General Public License is included in this distribution in - * the file called "COPYING". - * - * Contact Information - * Openair Admin: openair_admin@eurecom.fr - * Openair Tech : openair_tech@eurecom.fr - * Forums : http://forums.eurecom.fsr/openairinterface - * Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France - * + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + *******************************************************************************/ /*! \file lteRALenb_thresholds.h * \brief diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_variables.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_variables.h index 45de279fb97..b36b7b6ee71 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_variables.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/lteRALenb_variables.h @@ -1,23 +1,31 @@ -/***************************************************************************** - * Eurecom OpenAirInterface 3 - * Copyright(c) 2012 Eurecom - * - * Source eRALlte_variables.h - * - * Version 0.1 - * - * Date 06/26/2012 - * - * Product MIH RAL LTE - * - * Subsystem RAL-LTE internal data structure - * - * Authors Michelle Wetterwald, Lionel Gauthier, Frederic Maurel - * - * Description Defines the data structure managed by the RAL-LTE process at - * the network side and the access router dummy configuration. - * - *****************************************************************************/ +/******************************************************************************* + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + + *******************************************************************************/ #ifndef __LTE_RAL_ENB_VARIABLES_H__ #define __LTE_RAL_ENB_VARIABLES_H__ diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/rrc_d_types.h b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/rrc_d_types.h index 5caa8298b21..7432a0f3cd4 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/rrc_d_types.h +++ b/openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE/rrc_d_types.h @@ -1,11 +1,31 @@ -/********************************************************************* - rrc_d_types.h - description - ------------------- - copyright : (C) 2005 by Eurecom - email : Michelle.Wetterwald@eurecom.fr - ********************************************************************* - Define parameters common to Dummy RRC_UE and RRC_RG - ********************************************************************/ +/******************************************************************************* + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + + *******************************************************************************/ #ifndef __RRC_DTYPES_H__ #define __RRC_DTYPES_H__ diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/MIH-USER/lte_test_user/rg_mih_usr.cpp b/openair3/RAL-LTE/LTE_RAL_ENB/MIH-USER/lte_test_user/rg_mih_usr.cpp index b32628931c8..4084cde793e 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/MIH-USER/lte_test_user/rg_mih_usr.cpp +++ b/openair3/RAL-LTE/LTE_RAL_ENB/MIH-USER/lte_test_user/rg_mih_usr.cpp @@ -1,19 +1,31 @@ -//============================================================================== -// Brief : MIH-User -// Authors : Bruno Santos <bsantos@av.it.pt> -//------------------------------------------------------------------------------ -// ODTONE - Open Dot Twenty One -// -// Copyright (C) 2009-2012 Universidade Aveiro -// Copyright (C) 2009-2012 Instituto de Telecomunicações - Pólo Aveiro -// -// This software is distributed under a license. The full license -// agreement can be found in the file LICENSE in this distribution. -// This software may not be copied, modified, sold or distributed -// other than expressed in the named license agreement. -// -// This software is distributed without any warranty. -//============================================================================== +/******************************************************************************* + OpenAirInterface + Copyright(c) 1999 - 2014 Eurecom + + OpenAirInterface is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + + OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is + included in this distribution in the file called "COPYING". If not, + see <http://www.gnu.org/licenses/>. + + Contact Information + OpenAirInterface Admin: openair_admin@eurecom.fr + OpenAirInterface Tech : openair_tech@eurecom.fr + OpenAirInterface Dev : openair4g-devel@eurecom.fr + + Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE + + *******************************************************************************/ #include <odtone/base.hpp> #include <odtone/debug.hpp> diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_action.c b/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_action.c index 44048b34b0a..fa6fe420ffb 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_action.c +++ b/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_action.c @@ -69,7 +69,17 @@ void eRAL_action_request(ral_enb_instance_t instanceP, MIH_C_Message_Link_Action MIH_C_LINK_AC_TYPE_T link_action_type; MIH_C_LINK_AC_RESULT_T link_action_result; int link_action_done = 0; - + + + rrc_ral_connection_reconfiguration_req_t connection_reconfiguration_req_t; + MessageDef *message_p = NULL; + + message_p = itti_alloc_new_message (TASK_RAL_ENB, RRC_RAL_CONNECTION_RECONFIGURATION_REQ); + memset(&connection_reconfiguration_req_t, 0, sizeof(rrc_ral_connection_reconfiguration_req_t)); + // copy transaction id +// connection_reconfiguration_req_t.transaction_id = msgP->header.transaction_id; + + memcpy(&g_link_action, &msgP->primitive.LinkAction, sizeof(MIH_C_LINK_ACTION_T)); status = MIH_C_STATUS_SUCCESS; @@ -80,46 +90,46 @@ void eRAL_action_request(ral_enb_instance_t instanceP, MIH_C_Message_Link_Action * Read link action attributs * -------------------------- */ - if (msgP->primitive.LinkAction.link_ac_attr & MIH_C_BIT_LINK_AC_ATTR_LINK_SCAN) - { - /* - * Link scan operation request - Not supported by the network side: - * No measurements - */ - LOG_D(RAL_ENB, " ACTION ATTRIBUTE MIH_C_BIT_LINK_AC_ATTR_LINK_SCAN: REFUSED\n"); - link_action_result = MIH_C_LINK_AC_RESULT_REFUSED; - eRAL_send_link_action_confirm(instanceP, &msgP->header.transaction_id, - &status, - NULL, - &link_action_result); - } - - if (msgP->primitive.LinkAction.link_ac_attr & MIH_C_BIT_LINK_AC_ATTR_LINK_RES_RETAIN) - { - /* - * Link resource retain operation request - Not supported by the - * network side. - */ - LOG_D(RAL_ENB, " ACTION ATTRIBUTE MIH_C_BIT_LINK_AC_ATTR_LINK_RES_RETAIN: REFUSED\n"); - link_action_result = MIH_C_LINK_AC_RESULT_REFUSED; - eRAL_send_link_action_confirm(instanceP, &msgP->header.transaction_id, - &status, - NULL, - &link_action_result); - } - - if (msgP->primitive.LinkAction.link_ac_attr & MIH_C_BIT_LINK_AC_ATTR_DATA_FWD_REQ) - { - /* - * Data forward operation request - Not supported by the network side. - */ - LOG_D(RAL_ENB, " ACTION ATTRIBUTE MIH_C_BIT_LINK_AC_ATTR_DATA_FWD_REQ: REFUSED\n"); - link_action_result = MIH_C_LINK_AC_RESULT_REFUSED; - eRAL_send_link_action_confirm(instanceP, &msgP->header.transaction_id, - &status, - NULL, - &link_action_result); - } +// if (msgP->primitive.LinkAction.link_ac_attr & MIH_C_BIT_LINK_AC_ATTR_LINK_SCAN) +// { +// /* +// * Link scan operation request - Not supported by the network side: +// * No measurements +// */ +// LOG_D(RAL_ENB, " ACTION ATTRIBUTE MIH_C_BIT_LINK_AC_ATTR_LINK_SCAN: REFUSED\n"); +// link_action_result = MIH_C_LINK_AC_RESULT_REFUSED; +// eRAL_send_link_action_confirm(instanceP, &msgP->header.transaction_id, +// &status, +// NULL, +// &link_action_result); +// } + +// if (msgP->primitive.LinkAction.link_ac_attr & MIH_C_BIT_LINK_AC_ATTR_LINK_RES_RETAIN) +// { +// /* +// * Link resource retain operation request - Not supported by the +// * network side. +// */ +// LOG_D(RAL_ENB, " ACTION ATTRIBUTE MIH_C_BIT_LINK_AC_ATTR_LINK_RES_RETAIN: REFUSED\n"); +// link_action_result = MIH_C_LINK_AC_RESULT_REFUSED; +// eRAL_send_link_action_confirm(instanceP, &msgP->header.transaction_id, +// &status, +// NULL, +// &link_action_result); +// } + +// if (msgP->primitive.LinkAction.link_ac_attr & MIH_C_BIT_LINK_AC_ATTR_DATA_FWD_REQ) +// { +// /* +// * Data forward operation request - Not supported by the network side. +// */ +// LOG_D(RAL_ENB, " ACTION ATTRIBUTE MIH_C_BIT_LINK_AC_ATTR_DATA_FWD_REQ: REFUSED\n"); +// link_action_result = MIH_C_LINK_AC_RESULT_REFUSED; +// eRAL_send_link_action_confirm(instanceP, &msgP->header.transaction_id, +// &status, +// NULL, +// &link_action_result); +// } /* * Read link action request @@ -140,7 +150,7 @@ void eRAL_action_request(ral_enb_instance_t instanceP, MIH_C_Message_Link_Action switch (link_action_type) { case MIH_C_LINK_AC_TYPE_NONE: - LOG_D(RAL_ENB, " NO ACTION\n"); + LOG_D(RAL_ENB, " %s ACTION REQUESTED: MIH_C_LINK_AC_TYPE_NONE: NO ACTION\n", __FUNCTION__); break; #ifdef MIH_C_MEDIEVAL_EXTENSIONS @@ -185,13 +195,45 @@ void eRAL_action_request(ral_enb_instance_t instanceP, MIH_C_Message_Link_Action * - Not supported by the network side */ case MIH_C_LINK_AC_TYPE_LINK_POWER_UP: - /* - * Cause the link to power up and establish L2 connectivity. - * For UMTS link type, power up lower layers and establish - * PDP context - Not supported by the network side - */ - LOG_D(RAL_ENB, " REFUSED\n"); - link_action_result = MIH_C_LINK_AC_RESULT_REFUSED; + LOG_D(RAL_ENB, "%s ACTION REQUESTED: MIH_C_LINK_AC_TYPE_LINK_POWER_UP\n", __FUNCTION__); + if (g_enb_ral_obj[instanceP].mih_supported_link_action_list & (1 << MIH_C_LINK_AC_TYPE_LINK_POWER_UP)) { + // Activation requested - check it is not already active + if(g_enb_ral_obj[instanceP].pending_req_action & MIH_C_LINK_AC_TYPE_LINK_POWER_UP) { +// if (g_enb_ral_obj[instanceP].state == CONNECTED) { +// LOG_D(RAL_ENB, "Activation requested, but interface already active ==> NO OP\n"); +// mRAL_send_link_action_confirm(instanceP, &messageP->header.transaction_id, &status, &scan_response_set_list, &link_action_result); +// } else { + g_enb_ral_obj[instanceP].pending_req_action = g_enb_ral_obj[instanceP].pending_req_action | MIH_C_LINK_AC_TYPE_LINK_POWER_UP; +// g_enb_ral_obj[instanceP].cell_id = g_enb_ral_obj[instanceP].meas_cell_id[0]; // Default cell #0 - Next, choose cell with best conditions + LOG_D(RAL_ENB, "Activation requested to NAS interface on cell %d\n", g_enb_ral_obj[instanceP].cell_id); +// RAL_process_NAS_message(IO_OBJ_CNX, IO_CMD_ADD, g_enb_ral_obj[instanceP].cell_id); +// } + } else { + g_enb_ral_obj[instanceP].pending_req_action |= MIH_C_LINK_AC_TYPE_LINK_POWER_UP; + /* g_enb_ral_obj[instanceP].cell_id = g_enb_ral_obj[instanceP].meas_cell_id[0];*/ // Default cell #0 - Next, choose cell with best conditions + message_p = itti_alloc_new_message (TASK_RAL_ENB, RRC_RAL_CONNECTION_RECONFIGURATION_REQ); + memset(&connection_reconfiguration_req_t, 0, sizeof(rrc_ral_connection_reconfiguration_req_t)); +// copy transaction id + connection_reconfiguration_req_t.transaction_id = msgP->header.transaction_id; + + connection_reconfiguration_req_t.link_action.link_ac_type = msgP->primitive.LinkAction.link_ac_type; + connection_reconfiguration_req_t.link_action.link_ac_attr = msgP->primitive.LinkAction.link_ac_attr; + connection_reconfiguration_req_t.link_action.link_ac_param = msgP->primitive.LinkAction.link_ac_param; + + memcpy (&message_p->ittiMsg, (void *) &connection_reconfiguration_req_t, sizeof(rrc_ral_connection_reconfiguration_req_t)); + itti_send_msg_to_task (TASK_RRC_ENB, instanceP, message_p); + + /* LOG_D(RAL_ENB, "Total data volume0 %d\n", (g_enb_ral_obj[instanceP].totalDataVolume[0]/1000)); + LOG_D(RAL_ENB, "Total data volume1 %d\n", (g_enb_ral_obj[instanceP].totalDataVolume[1]/1000)); + LOG_D(RAL_ENB, "RLC Buffer Occupancy 0 %d\n", (g_enb_ral_obj[instanceP].rlcBufferOccupancy[0])); + LOG_D(RAL_ENB, "RLC Buffer Occupancy 1 %d\n", (g_enb_ral_obj[instanceP].rlcBufferOccupancy[1])); + */ + } + } else { + LOG_D(RAL_ENB, "[mRAL]: command POWER UP not available \n\n"); +// link_action_result = MIH_C_LINK_AC_RESULT_INCAPABLE; +// mRAL_send_link_action_confirm(instanceP, &msgP->header.transaction_id, &status, &scan_response_set_list, &link_action_result); + } break; default: @@ -384,6 +426,7 @@ int eRAL_action_is_in_progress(ral_enb_instance_t instanceP, MIH_C_STATUS_T* sta /* Check whether the action link command is supported */ if (!(g_enb_ral_obj[instanceP].mih_supported_link_command_list & MIH_C_BIT_LINK_ACTION)) { *status = MIH_C_STATUS_REJECTED; + LOG_D(RAL_ENB,"THE LINK ACTION is not in the list\n"); return 1; } *status = MIH_C_STATUS_SUCCESS; @@ -396,15 +439,19 @@ int eRAL_action_is_in_progress(ral_enb_instance_t instanceP, MIH_C_STATUS_T* sta { /* Another action request is in progress: * Do not process new request before completion of this one */ + LOG_D(RAL_ENB,"THE LINK ACTION is pending\n"); *ac_status = MIH_C_LINK_AC_RESULT_REFUSED; return 1; } /* The action request is supported and no other request is in progress: * Go ahead and process the request */ + + LOG_D(RAL_ENB,"THE LINK ACTION is not pending\n"); return 0; } + LOG_D(RAL_ENB,"THE LINK ACTION is not supported\n"); /* The link action request is not supported */ *ac_status = MIH_C_LINK_AC_RESULT_INCAPABLE; return 1; diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_main.c b/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_main.c index b56b675a516..bb1ef4ff2b4 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_main.c +++ b/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_main.c @@ -181,7 +181,10 @@ int eRAL_initialize(void){ // excluded MIH_C_LINK_AC_TYPE_LINK_POWER_UP g_enb_ral_obj[mod_id].mih_supported_link_action_list = (1 << MIH_C_LINK_AC_TYPE_LINK_FLOW_ATTR) | (1 << MIH_C_LINK_AC_TYPE_LINK_ACTIVATE_RESOURCES) | - (1 << MIH_C_LINK_AC_TYPE_LINK_DEACTIVATE_RESOURCES); + (1 << MIH_C_LINK_AC_TYPE_LINK_DEACTIVATE_RESOURCES)| + (1 << MIH_C_LINK_AC_TYPE_LINK_POWER_UP)| + (1 << MIH_C_LINK_AC_TYPE_LINK_DISCONNECT)| + (1 << MIH_C_LINK_AC_TYPE_LINK_POWER_DOWN); // excluded MIH_C_BIT_LINK_DETECTED // excluded MIH_C_BIT_LINK_GOING_DOWN // excluded MIH_C_BIT_LINK_HANDOVER_IMMINENT @@ -190,7 +193,7 @@ int eRAL_initialize(void){ g_enb_ral_obj[mod_id].mih_supported_link_event_list = MIH_C_BIT_LINK_UP | MIH_C_BIT_LINK_DOWN | MIH_C_BIT_LINK_PARAMETERS_REPORT; // excluded MIH_C_BIT_LINK_GET_PARAMETERS // excluded MIH_C_BIT_LINK_CONFIGURE_THRESHOLDS - g_enb_ral_obj[mod_id].mih_supported_link_command_list = MIH_C_BIT_LINK_EVENT_SUBSCRIBE | MIH_C_BIT_LINK_CONFIGURE_THRESHOLDS | + g_enb_ral_obj[mod_id].mih_supported_link_command_list = MIH_C_BIT_LINK_EVENT_SUBSCRIBE | MIH_C_BIT_LINK_CONFIGURE_THRESHOLDS | MIH_C_BIT_LINK_ACTION | MIH_C_BIT_LINK_EVENT_UNSUBSCRIBE | MIH_C_BIT_LINK_ACTION; diff --git a/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_mih_msg.c b/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_mih_msg.c index e29867ccf93..e112653a95a 100755 --- a/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_mih_msg.c +++ b/openair3/RAL-LTE/LTE_RAL_ENB/SRC/lteRALenb_mih_msg.c @@ -1052,6 +1052,7 @@ int eRAL_mih_link_process_message(ral_enb_instance_t instanceP){ struct sockaddr_in udp_socket; socklen_t sockaddr_len; + LOG_D(RAL_ENB,"HEEERRRE process mesage\n"); total_bytes_to_decode = 0; nb_bytes_received = 0; @@ -1225,6 +1226,8 @@ int eRAL_mih_link_msg_decode(ral_enb_instance_t instanceP, Bit_Buffer_t* bb_pP, int status = MIH_MESSAGE_DECODE_FAILURE; MIH_C_HEADER_T header; MIH_C_STATUS_T mih_status; + + LOG_D(RAL_ENB,"HEEERRRE decode\n"); if ((bb_pP != NULL) && (message_wrapper_pP != NULL)){ /* @@ -1243,6 +1246,7 @@ int eRAL_mih_link_msg_decode(ral_enb_instance_t instanceP, Bit_Buffer_t* bb_pP, /* * Decode MIH primitives */ + switch (message_wrapper_pP->message_id) { case MIH_C_MESSAGE_LINK_CAPABILITY_DISCOVER_REQUEST_ID: @@ -1382,6 +1386,8 @@ int eRAL_mih_link_msg_decode(ral_enb_instance_t instanceP, Bit_Buffer_t* bb_pP, default: LOG_W(RAL_ENB, " UNKNOWN MESSAGE ID SID %d, OP_CODE %d, AID %d\n", header.service_identifier, header.operation_code, header.action_identifier); status = MIH_MESSAGE_DECODE_FAILURE; + + return status; } } else { -- GitLab