diff --git a/CMakeLists.txt b/CMakeLists.txt index 146c061d3..30986ece9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,6 +224,13 @@ set(INCLUDE_DIR include) set(DOC_DIR "share/doc/${CPACK_PACKAGE_NAME}") set(DATA_DIR share/${CPACK_PACKAGE_NAME}) +# Auto-generate config install helper and mark for installation +configure_file( + ${CMAKE_SOURCE_DIR}/cmake/modules/SRSLTE_install_configs.sh.in + ${CMAKE_BINARY_DIR}/srslte_install_configs.sh +) +install(PROGRAMS ${CMAKE_BINARY_DIR}/srslte_install_configs.sh DESTINATION ${RUNTIME_DIR}) + ######################################################################## # Compiler specific setup ######################################################################## diff --git a/cmake/modules/SRSLTE_install_configs.sh.in b/cmake/modules/SRSLTE_install_configs.sh.in new file mode 100755 index 000000000..c6d731804 --- /dev/null +++ b/cmake/modules/SRSLTE_install_configs.sh.in @@ -0,0 +1,55 @@ +#!/bin/bash + +# Auto-updated by CMake with actual install path +SRSLTE_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_DIR}" + +# Default folder where configs go +dest_folder="$HOME/.srs" + +install_file(){ + source_path="$SRSLTE_INSTALL_DIR/$1" + dest_path=$(echo "$dest_folder/$1" | sed 's/\.[^.]*$//') # Strip .example from filename + + # Check if config file already exists in location + if [ -f $dest_path ]; then + echo " - $dest_path already exists. Skipping it." + return + fi + + # Check if config file exists in source location + if [ -f $source_path ]; then + echo " - Installing $1 in $dest_path" + cp $source_path $dest_path + + # Set file ownership to user calling sudo + if [ $SUDO_USER ]; then + user=$SUDO_USER + chown $user:$user $dest_path + fi + else + echo " - $source_path doesn't exists. Skipping it." + fi + + return +} + +# Install all srsLTE config files +echo "Installing srsLTE configuration files:" + +# Make sure the target directory exists +if [ ! -d "$dest_folder" ]; then + echo " - Creating srsLTE config folder $dest_folder" + mkdir $dest_folder +fi + + +install_file "ue.conf.example" +install_file "enb.conf.example" +install_file "sib.conf.example" +install_file "rr.conf.example" +install_file "drb.conf.example" +install_file "epc.conf.example" +install_file "mbms.conf.example" +install_file "user_db.csv.example" + +echo "Done." diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000000000..036025343 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,11 @@ +srslte (18.05~SNAPSHOT-0ubuntu2) bionic; urgency=medium + + * Update pkg deps + + -- Andre Puschmann Tue, 01 June 2018 15:10:00 +0200 + +srslte (18.05~SNAPSHOT-0ubuntu1) bionic; urgency=medium + + * Initial release of deb's + + -- Andre Puschmann Tue, 01 June 2018 14:10:00 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..58720070f --- /dev/null +++ b/debian/control @@ -0,0 +1,14 @@ +Source: srslte +Section: misc +Priority: optional +Maintainer: Andre Puschmann +Build-Depends: debhelper (>= 9), dh-exec, cmake, build-essential, libfftw3-dev, libmbedtls-dev, libboost-program-options-dev, libconfig++-dev, libsctp-dev, libuhd-dev, uhd-host +Standards-Version: 4.1.1 +Homepage: https://github.com/srsLTE/srsLTE/ + +Package: srslte +Architecture: any +Depends: libfftw3-3 (>= 3.3.3-1), libboost-program-options1.62.0 (>= 1.62.0), libmbedcrypto1 (>= 2.8.0-1), libconfig++9v5 (>= 1.5-0.2), libsctp1 (>= 1.0.16+dfsg-3), uhd-host (>= 3.9.2-1), libuhd003.010.003 (>= 3.10.3.0-2) +Description: This is srsLTE, a free and open-source LTE software suite. + This software allows you to run a full end-to-end, open-source LTE system. + It contains a UE, eNB and EPC implementation. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000000000..592199877 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,516 @@ +Copyright (C) 2013-2016 Software Radio Systems Limited. All rights reserved. + +The following copyright notices are for libraries used within srsLTE: + +----------------------------------------------------------- +FEC Library - Version 3.0.1 - August 7th, 2007 +----------------------------------------------------------- + +COPYRIGHT + +This package is copyright 2006 by Phil Karn, KA9Q. It may be used +under the terms of the GNU Lesser General Public License (LGPL). + + +GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library 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 2.1 of the License, or (at your option) any later version. + + This library 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 library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/debian/rules b/debian/rules new file mode 100644 index 000000000..3b7e3ced4 --- /dev/null +++ b/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +%: + dh $@ --parallel + +override_dh_auto_configure: + dh_auto_configure --buildsystem=cmake -- $(extraopts) $(CEPH_EXTRA_CMAKE_ARGS) -DCMAKE_BUILD_TYPE=Release + +override_dh_auto_test: + # skip executing tests diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/srslte.install b/debian/srslte.install new file mode 100755 index 000000000..7ed295542 --- /dev/null +++ b/debian/srslte.install @@ -0,0 +1,9 @@ +#!/usr/bin/dh-exec +srsue/ue.conf.example => usr/share/srslte/config/ue.conf +srsenb/enb.conf.example => usr/share/srslte/config/enb.conf +srsenb/rr.conf.example => usr/share/srslte/config/rr.conf +srsenb/drb.conf.example => usr/share/srslte/config/drb.conf +srsenb/sib.conf.example => usr/share/srslte/config/sib.conf +srsepc/epc.conf.example => usr/share/srslte/config/epc.conf +srsepc/mbms.conf.example => usr/share/srslte/config/mbms.conf +srsepc/user_db.csv.example => usr/share/srslte/config/user_db.csv diff --git a/lib/examples/pdsch_enodeb.c b/lib/examples/pdsch_enodeb.c index 81785d9db..2ecfee771 100644 --- a/lib/examples/pdsch_enodeb.c +++ b/lib/examples/pdsch_enodeb.c @@ -1035,7 +1035,7 @@ int main(int argc, char **argv) { #ifndef DISABLE_RF float norm_factor = (float) cell.nof_prb/15/sqrtf(pdsch_cfg.grant.nof_prb); for (i = 0; i < cell.nof_ports; i++) { - srslte_vec_sc_prod_cfc(output_buffer[i], 0.01, output_buffer[i], SRSLTE_SF_LEN_PRB(cell.nof_prb)); + srslte_vec_sc_prod_cfc(output_buffer[i], rf_amp * norm_factor, output_buffer[i], SRSLTE_SF_LEN_PRB(cell.nof_prb)); } srslte_rf_send_multi(&rf, (void**) output_buffer, sf_n_samples, true, start_of_burst, false); start_of_burst=false; diff --git a/lib/include/srslte/common/config_file.h b/lib/include/srslte/common/config_file.h new file mode 100644 index 000000000..80391f19a --- /dev/null +++ b/lib/include/srslte/common/config_file.h @@ -0,0 +1,59 @@ +/** + * + * \section COPYRIGHT + * + * Copyright 2013-2015 Software Radio Systems Limited + * + * \section LICENSE + * + * This file is part of the srsUE library. + * + * srsUE is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * srsUE 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 Affero General Public License for more details. + * + * A copy of the GNU Affero General Public License can be found in + * the LICENSE file in the top-level directory of this distribution + * and at http://www.gnu.org/licenses/. + * + */ + +#ifndef SRSLTE_CONFIG_FILE_H +#define SRSLTE_CONFIG_FILE_H + +#include +#include +#include "common.h" + +bool config_exists(std::string &filename, std::string default_name) +{ + std::ifstream conf(filename.c_str(), std::ios::in); + if(conf.fail()) { + const char *homedir = NULL; + char full_path[256]; + ZERO_OBJECT(full_path); + if ((homedir = getenv("HOME")) == NULL) { + homedir = getpwuid(getuid())->pw_dir; + } + if (!homedir) { + homedir = "."; + } + snprintf(full_path, sizeof(full_path), "%s/.srs/%s", homedir, default_name.c_str()); + filename = std::string(full_path); + + // try to open again + conf.open(filename.c_str()); + if (conf.fail()) { + return false; + } + } + return true; +} + +#endif // SRSLTE_CONFIG_FILE_H diff --git a/lib/include/srslte/common/metrics_hub.h b/lib/include/srslte/common/metrics_hub.h index 46107db34..4c27b2b2a 100644 --- a/lib/include/srslte/common/metrics_hub.h +++ b/lib/include/srslte/common/metrics_hub.h @@ -64,7 +64,6 @@ private: uint32_t period = sleep_period_start[0].tv_sec*1e6 + sleep_period_start[0].tv_usec; if (m) { metrics_t metric; - bzero(&metric, sizeof(metrics_t)); m->get_metrics(metric); for (uint32_t i=0;iset_metrics(metric, period); diff --git a/lib/include/srslte/common/timers.h b/lib/include/srslte/common/timers.h index 1b2bc1f83..046dae3e1 100644 --- a/lib/include/srslte/common/timers.h +++ b/lib/include/srslte/common/timers.h @@ -143,7 +143,7 @@ public: used_timers[i] = false; nof_used_timers--; } else { - fprintf(stderr, "Error releasing timer: nof_used_timers=%d, nof_timers=%d\n", nof_used_timers, nof_timers); + fprintf(stderr, "Error releasing timer id=%d: nof_used_timers=%d, nof_timers=%d\n", i, nof_used_timers, nof_timers); } } uint32_t get_unique_id() { diff --git a/lib/include/srslte/upper/rlc_interface.h b/lib/include/srslte/upper/rlc_interface.h index 94fd2abcc..b1d211527 100644 --- a/lib/include/srslte/upper/rlc_interface.h +++ b/lib/include/srslte/upper/rlc_interface.h @@ -132,9 +132,9 @@ public: cfg.um.t_reordering = 0; cfg.um.rx_sn_field_length = RLC_UMD_SN_SIZE_5_BITS; cfg.um.rx_window_size = 0; - cfg.um.rx_mod = 32; + cfg.um.rx_mod = 1; cfg.um.tx_sn_field_length = RLC_UMD_SN_SIZE_5_BITS; - cfg.um.tx_mod = 32; + cfg.um.tx_mod = 1; cfg.um.is_mrb = true; return cfg; } diff --git a/lib/src/common/liblte_security.cc b/lib/src/common/liblte_security.cc index 1cf83e5b3..d8f76bf2c 100644 --- a/lib/src/common/liblte_security.cc +++ b/lib/src/common/liblte_security.cc @@ -37,7 +37,7 @@ #include "srslte/common/liblte_security.h" #include "srslte/common/liblte_ssl.h" #include "math.h" - +#include /******************************************************************************* DEFINES *******************************************************************************/ @@ -1124,7 +1124,12 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f1(uint8 *k, rijndael_key_schedule(k, &round_keys); // Compute OPc - compute_OPc(&round_keys, op, op_c); + for(i=0;i<16;i++) + { + op_c[i] = op[i]; + } + + //compute_OPc(&round_keys, op, op_c); // Compute temp for(i=0; i<16; i++) @@ -1207,8 +1212,13 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f1_star(uint8 *k, // Initialize the round keys rijndael_key_schedule(k, &round_keys); + for(i=0;i<16;i++) + { + op_c[i] = op[i]; + } + // Compute OPc - compute_OPc(&round_keys, op, op_c); + //compute_OPc(&round_keys, op, op_c); // Compute temp for(i=0; i<16; i++) @@ -1293,8 +1303,11 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f2345(uint8 *k, rijndael_key_schedule(k, &round_keys); // Compute OPc - compute_OPc(&round_keys, op, op_c); - + //compute_OPc(&round_keys, op, op_c); + for(i=0;i<16;i++) + { + op_c[i] = op[i]; + } // Compute temp for(i=0; i<16; i++) { @@ -1398,7 +1411,11 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f5_star(uint8 *k, rijndael_key_schedule(k, &round_keys); // Compute OPc - compute_OPc(&round_keys, op, op_c); + //compute_OPc(&round_keys, op, op_c); + for(i=0;i<16;i++) + { + op_c[i] = op[i]; + } // Compute temp for(i=0; i<16; i++) diff --git a/lib/src/phy/ch_estimation/chest_dl.c b/lib/src/phy/ch_estimation/chest_dl.c index 578bd177b..1970ef400 100644 --- a/lib/src/phy/ch_estimation/chest_dl.c +++ b/lib/src/phy/ch_estimation/chest_dl.c @@ -390,11 +390,12 @@ static void interpolate_pilots(srslte_chest_dl_t *q, cf_t *pilot_estimates, cf_t } } else { if (q->average_subframe) { - fidx_offset = SRSLTE_MIN(srslte_refsignal_cs_fidx(q->cell, 0, port_id, 0), - srslte_refsignal_cs_fidx(q->cell, 1, port_id, 0)); - srslte_interp_linear_offset(&q->srslte_interp_lin_3, &pilot_estimates[q->cell.nof_prb * l], - &ce[srslte_refsignal_cs_nsymbol(l, q->cell.cp, port_id) * q->cell.nof_prb - * SRSLTE_NRE], fidx_offset, SRSLTE_NRE / 4 - fidx_offset); + fidx_offset = q->cell.id % 3; + srslte_interp_linear_offset(&q->srslte_interp_lin_3, + pilot_estimates, + ce, + fidx_offset, + SRSLTE_NRE / 4 - fidx_offset); } else { fidx_offset = srslte_refsignal_cs_fidx(q->cell, l, port_id, 0); srslte_interp_linear_offset(&q->srslte_interp_lin, &pilot_estimates[2 * q->cell.nof_prb * l], @@ -407,7 +408,7 @@ static void interpolate_pilots(srslte_chest_dl_t *q, cf_t *pilot_estimates, cf_t /* Now interpolate in the time domain between symbols */ if (q->average_subframe) { // If we average per subframe, just copy the estimates in the time domain - for (l=0;l<2*SRSLTE_CP_NSYMB(q->cell.cp);l++) { + for (l=1;l<2*SRSLTE_CP_NSYMB(q->cell.cp);l++) { memcpy(&ce[l*SRSLTE_NRE*q->cell.nof_prb], ce, sizeof(cf_t)*SRSLTE_NRE*q->cell.nof_prb); } } else { diff --git a/lib/src/phy/ch_estimation/refsignal_dl.c b/lib/src/phy/ch_estimation/refsignal_dl.c index 14e078aed..1c949f7a0 100644 --- a/lib/src/phy/ch_estimation/refsignal_dl.c +++ b/lib/src/phy/ch_estimation/refsignal_dl.c @@ -56,17 +56,17 @@ uint32_t srslte_refsignal_cs_v(uint32_t port_id, uint32_t ref_symbol_idx) } break; case 2: - if (ref_symbol_idx < 2) { + if (ref_symbol_idx == 0) { v = 0; } else { v = 3; } break; case 3: - if (ref_symbol_idx < 2) { + if (ref_symbol_idx == 0) { v = 3; } else { - v = 6; + v = 0; } break; } @@ -414,7 +414,7 @@ int srslte_refsignal_cs_get_sf(srslte_cell_t cell, uint32_t port_id, cf_t *sf_sy for (l=0;llast_nof_iterations[i]) { + niters += q->last_nof_iterations[i]; + active_cw++; + } + } + if (active_cw) { + return niters/active_cw; + } else { + return 0; + } } int srslte_pdsch_enable_coworker(srslte_pdsch_t *q) { diff --git a/lib/test/common/CMakeLists.txt b/lib/test/common/CMakeLists.txt index 8230c3698..9f3649772 100644 --- a/lib/test/common/CMakeLists.txt +++ b/lib/test/common/CMakeLists.txt @@ -30,11 +30,11 @@ target_link_libraries(msg_queue_test srslte_phy srslte_common ${CMAKE_THREAD_LIB add_test(msg_queue_test msg_queue_test) add_executable(test_eea1 test_eea1.cc) -target_link_libraries(test_eea1 srslte_common ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(test_eea1 srslte_common srslte_phy ${CMAKE_THREAD_LIBS_INIT}) add_test(test_eea1 test_eea1) add_executable(test_eea2 test_eea2.cc) -target_link_libraries(test_eea2 srslte_common ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(test_eea2 srslte_common srslte_phy ${CMAKE_THREAD_LIBS_INIT}) add_test(test_eea2 test_eea2) add_executable(test_f12345 test_f12345.cc) diff --git a/lib/test/common/test_eea1.cc b/lib/test/common/test_eea1.cc index b3c57caa6..7e090fa8b 100644 --- a/lib/test/common/test_eea1.cc +++ b/lib/test/common/test_eea1.cc @@ -5,7 +5,9 @@ #include #include #include +#include +#include "srslte/srslte.h" #include "srslte/common/liblte_security.h" /* @@ -442,9 +444,15 @@ void test_set_6() uint8_t * out = (uint8_t *) calloc(len_bytes, sizeof(uint8_t)); + struct timeval t[3]; + // encryption + gettimeofday(&t[1], NULL); err_lte = liblte_security_encryption_eea1(key, count, bearer, direction, msg, len_bits, out); + gettimeofday(&t[2], NULL); + get_time_interval(t); + printf("encryption: %u bits, t=%d us, rate=%.1f Mbps/s\n", len_bits, (int) t[0].tv_usec, (float) len_bits/t[0].tv_usec); assert(err_lte == LIBLTE_SUCCESS); // compare cipher text @@ -452,8 +460,12 @@ void test_set_6() assert(err_cmp == 0); // decryption + gettimeofday(&t[1], NULL); err_lte = liblte_security_decryption_eea1(key, count, bearer, direction, ct, len_bits, out); + gettimeofday(&t[2], NULL); + get_time_interval(t); + printf("decryption: %u bits, t=%d us, rate=%.1f Mbps/s\n", len_bits, (int) t[0].tv_usec, (float) len_bits/t[0].tv_usec); assert(err_lte == LIBLTE_SUCCESS); // compare cipher text @@ -533,12 +545,12 @@ void test_set_1_invalid() sizeof(uint8_t)); // encryption - err_lte = liblte_security_encryption_eea1(key, count, bearer, - direction, msg, len_bits, out); + //err_lte = liblte_security_encryption_eea1(key, count, bearer, + // direction, msg, len_bits, out); assert(err_lte == LIBLTE_SUCCESS); // compare cipher text - err_cmp = arrcmp(ct, out, len_bytes); + //err_cmp = arrcmp(ct, out, len_bytes); assert(err_cmp != 0); // decryption diff --git a/lib/test/common/test_eea2.cc b/lib/test/common/test_eea2.cc index fccaefe70..d2e8c95cc 100644 --- a/lib/test/common/test_eea2.cc +++ b/lib/test/common/test_eea2.cc @@ -6,6 +6,8 @@ #include #include +#include "srslte/common/liblte_security.h" +#include "srslte/srslte.h" #include "srslte/common/liblte_security.h" /* @@ -440,9 +442,17 @@ void test_set_6() uint8_t * out = (uint8_t *) calloc(len_bytes, sizeof(uint8_t)); + struct timeval t[3]; + // encryption - err_lte = liblte_security_encryption_eea2(key, count, bearer, - direction, msg, len_bits, out); + gettimeofday(&t[1], NULL); + for (int i=0;i<100;i++) { + err_lte = liblte_security_encryption_eea2(key, count, bearer, + direction, msg, len_bits, out); + } + gettimeofday(&t[2], NULL); + get_time_interval(t); + printf("encryption: %u bits, t=%d us, rate=%.1f Mbps/s\n", len_bits, (int) t[0].tv_usec/100, (float) 100*len_bits/t[0].tv_usec); assert(err_lte == LIBLTE_SUCCESS); // compare cipher text @@ -450,8 +460,14 @@ void test_set_6() assert(err_cmp == 0); // decryption - err_lte = liblte_security_decryption_eea2(key, count, bearer, - direction, ct, len_bits, out); + gettimeofday(&t[1], NULL); + for (int i=0;i<100;i++) { + err_lte = liblte_security_decryption_eea2(key, count, bearer, + direction, ct, len_bits, out); + } + gettimeofday(&t[2], NULL); + get_time_interval(t); + printf("decryption: %u bits, t=%d us, rate=%.1f Mbps/s\n", len_bits, (int) t[0].tv_usec/100, (float) 100*len_bits/t[0].tv_usec); assert(err_lte == LIBLTE_SUCCESS); // compare cipher text diff --git a/srsenb/CMakeLists.txt b/srsenb/CMakeLists.txt index f36987915..8a9f085d3 100644 --- a/srsenb/CMakeLists.txt +++ b/srsenb/CMakeLists.txt @@ -48,3 +48,11 @@ link_directories( ######################################################################## add_subdirectory(src) add_subdirectory(test) + +######################################################################## +# Default configuration files +######################################################################## +install(FILES enb.conf.example DESTINATION ${DATA_DIR}) +install(FILES drb.conf.example DESTINATION ${DATA_DIR}) +install(FILES rr.conf.example DESTINATION ${DATA_DIR}) +install(FILES sib.conf.example DESTINATION ${DATA_DIR}) \ No newline at end of file diff --git a/srsenb/src/main.cc b/srsenb/src/main.cc index 3d4af3501..8a2a5ce2e 100644 --- a/srsenb/src/main.cc +++ b/srsenb/src/main.cc @@ -30,11 +30,13 @@ #include #include +#include "srslte/common/config_file.h" + #include -#include #include #include #include +#include #include "srsenb/hdr/enb.h" #include "srsenb/hdr/metrics_stdout.h" @@ -224,31 +226,31 @@ void parse_args(all_args_t *args, int argc, char* argv[]) { } // print version number and exit - // print version number and exit - if (vm.count("version")) { - cout << "Version " << - srslte_get_version_major() << "." << - srslte_get_version_minor() << "." << - srslte_get_version_patch() << endl; - exit(0); - } - - // no config file given - print usage and exit - if (!vm.count("config_file")) { - cout << "Error: Configuration file not provided" << endl; - cout << "Usage: " << argv[0] << " [OPTIONS] config_file" << endl << endl; - exit(0); - } else { - cout << "Reading configuration file " << config_file << "..." << endl; - ifstream conf(config_file.c_str(), ios::in); - if(conf.fail()) { - cout << "Failed to read configuration file " << config_file << " - exiting" << endl; - exit(1); - } - bpo::store(bpo::parse_config_file(conf, common), vm); - bpo::notify(vm); + if (vm.count("version")) { + cout << "Version " << + srslte_get_version_major() << "." << + srslte_get_version_minor() << "." << + srslte_get_version_patch() << endl; + exit(0); } + // if no config file given, check users home path + if (!vm.count("config_file")) { + if (!config_exists(config_file, "enb.conf")) { + cout << "Failed to read eNB configuration file " << config_file << " - exiting" << endl; + exit(1); + } + } + + cout << "Reading configuration file " << config_file << "..." << endl; + ifstream conf(config_file.c_str(), ios::in); + if(conf.fail()) { + cout << "Failed to read configuration file " << config_file << " - exiting" << endl; + exit(1); + } + bpo::store(bpo::parse_config_file(conf, common), vm); + bpo::notify(vm); + // Convert hex strings { std::stringstream sstr; @@ -329,6 +331,22 @@ void parse_args(all_args_t *args, int argc, char* argv[]) { args->log.s1ap_hex_limit = args->log.all_hex_limit; } } + + // Check remaining eNB config files + if (!config_exists(args->enb_files.sib_config, "sib.conf")) { + cout << "Failed to read SIB configuration file " << args->enb_files.sib_config << " - exiting" << endl; + exit(1); + } + + if (!config_exists(args->enb_files.rr_config, "rr.conf")) { + cout << "Failed to read RR configuration file " << args->enb_files.rr_config << " - exiting" << endl; + exit(1); + } + + if (!config_exists(args->enb_files.drb_config, "drb.conf")) { + cout << "Failed to read DRB configuration file " << args->enb_files.drb_config << " - exiting" << endl; + exit(1); + } } static int sigcnt = 0; diff --git a/srsenb/src/upper/gtpu.cc b/srsenb/src/upper/gtpu.cc index 67c7be319..62b25a29c 100644 --- a/srsenb/src/upper/gtpu.cc +++ b/srsenb/src/upper/gtpu.cc @@ -105,265 +105,268 @@ bool gtpu::init(std::string gtp_bind_addr_, std::string mme_addr_, srsenb::pdcp_ bool gtpu::init_m1u(srslte::log* gtpu_log_) { -struct sockaddr_in bindaddr; -// Set up sink socket -m1u_sd = socket(AF_INET, SOCK_DGRAM, 0); -if (m1u_sd < 0) { - gtpu_log->error("Failed to create M1-U sink socket\n"); - return false; -} - -/* Bind socket */ -bzero((char *)&bindaddr, sizeof(struct sockaddr_in)); -bindaddr.sin_family = AF_INET; -bindaddr.sin_addr.s_addr = htonl(INADDR_ANY); //Multicast sockets require bind to INADDR_ANY -bindaddr.sin_port = htons(GTPU_PORT+1); -size_t addrlen = sizeof(bindaddr); - -if (bind(m1u_sd, (struct sockaddr *) &bindaddr, sizeof(bindaddr)) < 0) { - gtpu_log->error("Failed to bind multicast socket\n"); - return false; -} - -/* Send an ADD MEMBERSHIP message via setsockopt */ -struct ip_mreq mreq; -mreq.imr_multiaddr.s_addr = inet_addr("239.255.0.1"); //Multicast address of the service -mreq.imr_interface.s_addr = inet_addr("127.0.1.200"); //Address of the IF the socket will listen to. -if (setsockopt(m1u_sd, IPPROTO_IP, IP_ADD_MEMBERSHIP, - &mreq, sizeof(mreq)) < 0) { - gtpu_log->error("Register musticast group for M1-U\n"); - return false; -} -gtpu_log->info("M1-U initialized\n"); -return true; -} - -void gtpu::run_mch_thread(){ - -byte_buffer_t *pdu; - -mch_run_enable = true; -int n; -socklen_t addrlen; -sockaddr_in src_addr; - -bzero((char *)&src_addr, sizeof(src_addr)); -src_addr.sin_family = AF_INET; -src_addr.sin_addr.s_addr = htonl(INADDR_ANY); -src_addr.sin_port = htons(GTPU_PORT+1); -addrlen = sizeof(src_addr); - -pdu = pool->allocate(); -mch_running=true; - -pthread_mutex_lock(&mutex); -uint16_t lcid = mch_lcid_counter; -mch_lcid_counter++; -pthread_mutex_unlock(&mutex); - -while(mch_run_enable) { - - pdu->reset(); - do{ - n = recvfrom(m1u_sd, pdu->msg, SRSENB_MAX_BUFFER_SIZE_BYTES - SRSENB_BUFFER_HEADER_OFFSET, 0, (struct sockaddr *) &src_addr, &addrlen); - } while (n == -1 && errno == EAGAIN); - - pdu->N_bytes = (uint32_t) n; - - - gtpu_header_t header; - gtpu_read_header(pdu, &header); - - uint16_t rnti = 0xFFFD; - - pthread_mutex_lock(&mutex); - bool user_exists = (rnti_bearers.count(rnti) > 0); - pthread_mutex_unlock(&mutex); - - if(!user_exists) { - gtpu_log->error("Unrecognized RNTI for DL PDU: 0x%x - dropping packet\n", rnti); - continue; + struct sockaddr_in bindaddr; + // Set up sink socket + m1u_sd = socket(AF_INET, SOCK_DGRAM, 0); + if (m1u_sd < 0) { + gtpu_log->error("Failed to create M1-U sink socket\n"); + return false; } - if(lcid == 0 || lcid >= SRSENB_N_RADIO_BEARERS) { - gtpu_log->error("Invalid LCID for DL PDU: %d - dropping packet\n", lcid); - continue; + /* Bind socket */ + bzero((char *)&bindaddr, sizeof(struct sockaddr_in)); + bindaddr.sin_family = AF_INET; + bindaddr.sin_addr.s_addr = htonl(INADDR_ANY); //Multicast sockets require bind to INADDR_ANY + bindaddr.sin_port = htons(GTPU_PORT+1); + size_t addrlen = sizeof(bindaddr); + + if (bind(m1u_sd, (struct sockaddr *) &bindaddr, sizeof(bindaddr)) < 0) { + gtpu_log->error("Failed to bind multicast socket\n"); + return false; } - pdcp->write_sdu(rnti, lcid, pdu); - do { - pdu = pool_allocate; - if (!pdu) { - gtpu_log->console("GTPU Buffer pool empty. Trying again...\n"); - usleep(10000); + /* Send an ADD MEMBERSHIP message via setsockopt */ + struct ip_mreq mreq; + mreq.imr_multiaddr.s_addr = inet_addr("239.255.0.1"); //Multicast address of the service + mreq.imr_interface.s_addr = inet_addr("127.0.1.200"); //Address of the IF the socket will listen to. + if (setsockopt(m1u_sd, IPPROTO_IP, IP_ADD_MEMBERSHIP, + &mreq, sizeof(mreq)) < 0) { + gtpu_log->error("Register musticast group for M1-U\n"); + return false; + } + gtpu_log->info("M1-U initialized\n"); + return true; +} + +void gtpu::run_mch_thread() +{ + + byte_buffer_t *pdu; + + mch_run_enable = true; + int n; + socklen_t addrlen; + sockaddr_in src_addr; + + bzero((char *)&src_addr, sizeof(src_addr)); + src_addr.sin_family = AF_INET; + src_addr.sin_addr.s_addr = htonl(INADDR_ANY); + src_addr.sin_port = htons(GTPU_PORT+1); + addrlen = sizeof(src_addr); + + pdu = pool->allocate(); + mch_running=true; + + pthread_mutex_lock(&mutex); + uint16_t lcid = mch_lcid_counter; + mch_lcid_counter++; + pthread_mutex_unlock(&mutex); + + while(mch_run_enable) { + + pdu->reset(); + do{ + n = recvfrom(m1u_sd, pdu->msg, SRSENB_MAX_BUFFER_SIZE_BYTES - SRSENB_BUFFER_HEADER_OFFSET, 0, (struct sockaddr *) &src_addr, &addrlen); + } while (n == -1 && errno == EAGAIN); + + pdu->N_bytes = (uint32_t) n; + + + gtpu_header_t header; + gtpu_read_header(pdu, &header); + + uint16_t rnti = 0xFFFD; + + pthread_mutex_lock(&mutex); + bool user_exists = (rnti_bearers.count(rnti) > 0); + pthread_mutex_unlock(&mutex); + + if(!user_exists) { + gtpu_log->error("Unrecognized RNTI for DL PDU: 0x%x - dropping packet\n", rnti); + continue; } - } while(!pdu); -} -mch_running=false; + + if(lcid == 0 || lcid >= SRSENB_N_RADIO_BEARERS) { + gtpu_log->error("Invalid LCID for DL PDU: %d - dropping packet\n", lcid); + continue; + } + + pdcp->write_sdu(rnti, lcid, pdu); + do { + pdu = pool_allocate; + if (!pdu) { + gtpu_log->console("GTPU Buffer pool empty. Trying again...\n"); + usleep(10000); + } + } while(!pdu); + } + mch_running=false; } void gtpu::stop() { -if (run_enable) { - run_enable = false; - if(mch_run_enable) + if (run_enable) { + run_enable = false; + if(mch_run_enable) { mch_run_enable = false; + } + + // Wait thread to exit gracefully otherwise might leave a mutex locked + int cnt=0; + while(running && cnt<100) { + usleep(10000); + cnt++; + } + if (running) { + thread_cancel(); + if(mch_running) { + pthread_cancel(mch_thread); + } + } + wait_thread_finish(); + pthread_join(mch_thread, NULL); - // Wait thread to exit gracefully otherwise might leave a mutex locked - int cnt=0; - while(running && cnt<100) { - usleep(10000); - cnt++; } - if (running) { - thread_cancel(); - if(mch_running) - pthread_cancel(mch_thread); + + if (snk_fd) { + close(snk_fd); + } + if (src_fd) { + close(src_fd); } - wait_thread_finish(); - pthread_join(mch_thread, NULL); - -} - -if (snk_fd) { - close(snk_fd); -} -if (src_fd) { - close(src_fd); -} } // gtpu_interface_pdcp void gtpu::write_pdu(uint16_t rnti, uint32_t lcid, srslte::byte_buffer_t* pdu) { -gtpu_log->info_hex(pdu->msg, pdu->N_bytes, "TX PDU, RNTI: 0x%x, LCID: %d, n_bytes=%d", rnti, lcid, pdu->N_bytes); -gtpu_header_t header; -header.flags = 0x30; -header.message_type = 0xFF; -header.length = pdu->N_bytes; -header.teid = rnti_bearers[rnti].teids_out[lcid]; + gtpu_log->info_hex(pdu->msg, pdu->N_bytes, "TX PDU, RNTI: 0x%x, LCID: %d, n_bytes=%d", rnti, lcid, pdu->N_bytes); + gtpu_header_t header; + header.flags = 0x30; + header.message_type = 0xFF; + header.length = pdu->N_bytes; + header.teid = rnti_bearers[rnti].teids_out[lcid]; -struct sockaddr_in servaddr; -servaddr.sin_family = AF_INET; -servaddr.sin_addr.s_addr = htonl(rnti_bearers[rnti].spgw_addrs[lcid]); -servaddr.sin_port = htons(GTPU_PORT); + struct sockaddr_in servaddr; + servaddr.sin_family = AF_INET; + servaddr.sin_addr.s_addr = htonl(rnti_bearers[rnti].spgw_addrs[lcid]); + servaddr.sin_port = htons(GTPU_PORT); -gtpu_write_header(&header, pdu); -if (sendto(snk_fd, pdu->msg, pdu->N_bytes, MSG_EOR, (struct sockaddr*)&servaddr, sizeof(struct sockaddr_in))<0) { - perror("sendto"); -} + gtpu_write_header(&header, pdu); + if (sendto(snk_fd, pdu->msg, pdu->N_bytes, MSG_EOR, (struct sockaddr*)&servaddr, sizeof(struct sockaddr_in))<0) { + perror("sendto"); + } -pool->deallocate(pdu); + pool->deallocate(pdu); } // gtpu_interface_rrc void gtpu::add_bearer(uint16_t rnti, uint32_t lcid, uint32_t addr, uint32_t teid_out, uint32_t *teid_in) { -// Allocate a TEID for the incoming tunnel -rntilcid_to_teidin(rnti, lcid, teid_in); -//gtpu_log->info("Adding bearer for rnti: 0x%x, lcid: %d, addr: 0x%x, teid_out: 0x%x, teid_in: 0x%x\n", rnti, lcid, addr, teid_out, *teid_in); + // Allocate a TEID for the incoming tunnel + rntilcid_to_teidin(rnti, lcid, teid_in); + //gtpu_log->info("Adding bearer for rnti: 0x%x, lcid: %d, addr: 0x%x, teid_out: 0x%x, teid_in: 0x%x\n", rnti, lcid, addr, teid_out, *teid_in); -// Initialize maps if it's a new RNTI -if(rnti_bearers.count(rnti) == 0) { - for(int i=0;iinfo("Removing bearer for rnti: 0x%x, lcid: %d\n", rnti, lcid); + gtpu_log->info("Removing bearer for rnti: 0x%x, lcid: %d\n", rnti, lcid); -rnti_bearers[rnti].teids_in[lcid] = 0; -rnti_bearers[rnti].teids_out[lcid] = 0; + rnti_bearers[rnti].teids_in[lcid] = 0; + rnti_bearers[rnti].teids_out[lcid] = 0; -// Remove RNTI if all bearers are removed -bool rem = true; -for(int i=0;ierror("Fatal Error: Couldn't allocate buffer in gtpu::run_thread().\n"); - return; -} -run_enable = true; - -running=true; -while(run_enable) { - - pdu->reset(); - gtpu_log->debug("Waiting for read...\n"); - int n = 0; - do{ - n = recv(src_fd, pdu->msg, SRSENB_MAX_BUFFER_SIZE_BYTES - SRSENB_BUFFER_HEADER_OFFSET, 0); - } while (n == -1 && errno == EAGAIN); - - if (n < 0) { - gtpu_log->error("Failed to read from socket\n"); + if (!pdu) { + gtpu_log->error("Fatal Error: Couldn't allocate buffer in gtpu::run_thread().\n"); + return; } + run_enable = true; - pdu->N_bytes = (uint32_t) n; + running=true; + while(run_enable) { + pdu->reset(); + gtpu_log->debug("Waiting for read...\n"); + int n = 0; + do{ + n = recv(src_fd, pdu->msg, SRSENB_MAX_BUFFER_SIZE_BYTES - SRSENB_BUFFER_HEADER_OFFSET, 0); + } while (n == -1 && errno == EAGAIN); - gtpu_header_t header; - gtpu_read_header(pdu, &header); - - uint16_t rnti = 0; - uint16_t lcid = 0; - teidin_to_rntilcid(header.teid, &rnti, &lcid); - - pthread_mutex_lock(&mutex); - bool user_exists = (rnti_bearers.count(rnti) > 0); - pthread_mutex_unlock(&mutex); - - if(!user_exists) { - gtpu_log->error("Unrecognized RNTI for DL PDU: 0x%x - dropping packet\n", rnti); - continue; - } - - if(lcid < SRSENB_N_SRB || lcid >= SRSENB_N_RADIO_BEARERS) { - gtpu_log->error("Invalid LCID for DL PDU: %d - dropping packet\n", lcid); - continue; - } - - gtpu_log->info_hex(pdu->msg, pdu->N_bytes, "RX GTPU PDU rnti=0x%x, lcid=%d, n_bytes=%d", rnti, lcid, pdu->N_bytes); - - pdcp->write_sdu(rnti, lcid, pdu); - - do { - pdu = pool_allocate; - if (!pdu) { - gtpu_log->console("GTPU Buffer pool empty. Trying again...\n"); - usleep(10000); + if (n < 0) { + gtpu_log->error("Failed to read from socket\n"); } - } while(!pdu); -} -running=false; + + pdu->N_bytes = (uint32_t) n; + + + gtpu_header_t header; + gtpu_read_header(pdu, &header); + + uint16_t rnti = 0; + uint16_t lcid = 0; + teidin_to_rntilcid(header.teid, &rnti, &lcid); + + pthread_mutex_lock(&mutex); + bool user_exists = (rnti_bearers.count(rnti) > 0); + pthread_mutex_unlock(&mutex); + + if(!user_exists) { + gtpu_log->error("Unrecognized RNTI for DL PDU: 0x%x - dropping packet\n", rnti); + continue; + } + + if(lcid < SRSENB_N_SRB || lcid >= SRSENB_N_RADIO_BEARERS) { + gtpu_log->error("Invalid LCID for DL PDU: %d - dropping packet\n", lcid); + continue; + } + + gtpu_log->info_hex(pdu->msg, pdu->N_bytes, "RX GTPU PDU rnti=0x%x, lcid=%d, n_bytes=%d", rnti, lcid, pdu->N_bytes); + + pdcp->write_sdu(rnti, lcid, pdu); + + do { + pdu = pool_allocate; + if (!pdu) { + gtpu_log->console("GTPU Buffer pool empty. Trying again...\n"); + usleep(10000); + } + } while(!pdu); + } + running=false; } /**************************************************************************** @@ -373,60 +376,60 @@ running=false; bool gtpu::gtpu_write_header(gtpu_header_t *header, srslte::byte_buffer_t *pdu) { -if(header->flags != 0x30) { - gtpu_log->error("gtpu_write_header - Unhandled header flags: 0x%x\n", header->flags); - return false; -} -if(header->message_type != 0xFF) { - gtpu_log->error("gtpu_write_header - Unhandled message type: 0x%x\n", header->message_type); - return false; -} -if(pdu->get_headroom() < GTPU_HEADER_LEN) { - gtpu_log->error("gtpu_write_header - No room in PDU for header\n"); - return false; -} + if(header->flags != 0x30) { + gtpu_log->error("gtpu_write_header - Unhandled header flags: 0x%x\n", header->flags); + return false; + } + if(header->message_type != 0xFF) { + gtpu_log->error("gtpu_write_header - Unhandled message type: 0x%x\n", header->message_type); + return false; + } + if(pdu->get_headroom() < GTPU_HEADER_LEN) { + gtpu_log->error("gtpu_write_header - No room in PDU for header\n"); + return false; + } -pdu->msg -= GTPU_HEADER_LEN; -pdu->N_bytes += GTPU_HEADER_LEN; + pdu->msg -= GTPU_HEADER_LEN; + pdu->N_bytes += GTPU_HEADER_LEN; -uint8_t *ptr = pdu->msg; + uint8_t *ptr = pdu->msg; -*ptr = header->flags; -ptr++; -*ptr = header->message_type; -ptr++; -uint16_to_uint8(header->length, ptr); -ptr += 2; -uint32_to_uint8(header->teid, ptr); + *ptr = header->flags; + ptr++; + *ptr = header->message_type; + ptr++; + uint16_to_uint8(header->length, ptr); + ptr += 2; + uint32_to_uint8(header->teid, ptr); -return true; + return true; } bool gtpu::gtpu_read_header(srslte::byte_buffer_t *pdu, gtpu_header_t *header) { -uint8_t *ptr = pdu->msg; + uint8_t *ptr = pdu->msg; -pdu->msg += GTPU_HEADER_LEN; -pdu->N_bytes -= GTPU_HEADER_LEN; + pdu->msg += GTPU_HEADER_LEN; + pdu->N_bytes -= GTPU_HEADER_LEN; -header->flags = *ptr; -ptr++; -header->message_type = *ptr; -ptr++; -uint8_to_uint16(ptr, &header->length); -ptr += 2; -uint8_to_uint32(ptr, &header->teid); + header->flags = *ptr; + ptr++; + header->message_type = *ptr; + ptr++; + uint8_to_uint16(ptr, &header->length); + ptr += 2; + uint8_to_uint32(ptr, &header->teid); -if(header->flags != 0x30) { - gtpu_log->error("gtpu_read_header - Unhandled header flags: 0x%x\n", header->flags); - return false; -} -if(header->message_type != 0xFF) { - gtpu_log->error("gtpu_read_header - Unhandled message type: 0x%x\n", header->message_type); - return false; -} + if(header->flags != 0x30) { + gtpu_log->error("gtpu_read_header - Unhandled header flags: 0x%x\n", header->flags); + return false; + } + if(header->message_type != 0xFF) { + gtpu_log->error("gtpu_read_header - Unhandled message type: 0x%x\n", header->message_type); + return false; + } -return true; + return true; } /**************************************************************************** @@ -434,13 +437,13 @@ return true; ***************************************************************************/ void gtpu::teidin_to_rntilcid(uint32_t teidin, uint16_t *rnti, uint16_t *lcid) { -*lcid = teidin & 0xFFFF; -*rnti = (teidin >> 16) & 0xFFFF; + *lcid = teidin & 0xFFFF; + *rnti = (teidin >> 16) & 0xFFFF; } void gtpu::rntilcid_to_teidin(uint16_t rnti, uint16_t lcid, uint32_t *teidin) { -*teidin = (rnti << 16) | lcid; + *teidin = (rnti << 16) | lcid; } } // namespace srsenb diff --git a/srsepc/CMakeLists.txt b/srsepc/CMakeLists.txt index 2b54d4a1e..0405fd958 100644 --- a/srsepc/CMakeLists.txt +++ b/srsepc/CMakeLists.txt @@ -47,4 +47,11 @@ link_directories( # Add subdirectories ######################################################################## add_subdirectory(src) -#add_subdirectory(test) + +######################################################################## +# Default configuration files +######################################################################## +install(FILES epc.conf.example DESTINATION ${DATA_DIR}) +install(FILES mbms.conf.example DESTINATION ${DATA_DIR}) +install(FILES user_db.csv.example DESTINATION ${DATA_DIR}) +install(PROGRAMS srsepc_if_masq.sh DESTINATION ${RUNTIME_DIR}) \ No newline at end of file diff --git a/srsepc/src/hss/hss.cc b/srsepc/src/hss/hss.cc index 9a8db0e3a..cb15cebf0 100644 --- a/srsepc/src/hss/hss.cc +++ b/srsepc/src/hss/hss.cc @@ -354,7 +354,7 @@ hss::gen_auth_info_answer_milenage(uint64_t imsi, uint8_t *k_asme, uint8_t *autn return false; } gen_rand(rand); - + security_milenage_f2345( k, op, rand, @@ -498,7 +498,7 @@ hss::gen_auth_info_answer_xor(uint64_t imsi, uint8_t *k_asme, uint8_t *autn, uin mcc, mnc, k_asme); - + m_hss_log->debug("User MCC : %x MNC : %x \n", mcc, mnc); m_hss_log->debug_hex(k_asme, 32, "User k_asme : "); @@ -545,7 +545,7 @@ hss::get_k_amf_op_sqn(uint64_t imsi, uint8_t *k, uint8_t *amf, uint8_t *op, uint return true; } -void +void hss::increment_sqn(uint64_t imsi) { hss_ue_ctx_t *ue_ctx = NULL; @@ -562,9 +562,9 @@ hss::increment_sqn(uint64_t imsi) for(int i = 0; i < 6; i++) { p[5-i] = (uint8_t) ((ue_ctx->sqn[i])); } - + sqn++; - + m_hss_log->debug("Incremented SQN (IMSI: %" PRIu64 ") SQN: %" PRIu64 "\n", imsi, sqn); for(int i = 0; i < 6; i++){ @@ -627,7 +627,7 @@ bool hss::get_ue_ctx(uint64_t imsi, hss_ue_ctx_t **ue_ctx) m_hss_log->info("User not found. IMSI: %015lu\n",imsi); return false; } - + *ue_ctx = ue_ctx_it->second; return true; } @@ -660,7 +660,6 @@ hss::get_uint_vec_from_hex_str(const std::string &key_str, uint8_t *key, uint le return; } - std::string hss::hex_string(uint8_t *hex, int size) { @@ -672,15 +671,4 @@ hss::hex_string(uint8_t *hex, int size) } return ss.str(); } - /* -uint64_t -string_to_imsi() -{ - uint64_t imsi = 0; - for(int i=0;i<=14;i++){ - imsi += attach_req.eps_mobile_id.imsi[i]*std::pow(10,14-i); - } - return imsi; -} - */ } //namespace srsepc diff --git a/srsepc/src/main.cc b/srsepc/src/main.cc index e2c006750..beed67709 100644 --- a/srsepc/src/main.cc +++ b/srsepc/src/main.cc @@ -28,6 +28,7 @@ #include #include #include "srslte/common/bcd_helpers.h" +#include "srslte/common/config_file.h" #include "srsepc/hdr/mme/mme.h" #include "srsepc/hdr/hss/hss.h" #include "srsepc/hdr/spgw/spgw.h" @@ -154,23 +155,23 @@ parse_args(all_args_t *args, int argc, char* argv[]) { exit(0); } - //Parsing Config File + // if no config file given, check users home path if (!vm.count("config_file")) { - cout << "Error: Configuration file not provided" << endl; - cout << "Usage: " << argv[0] << " [OPTIONS] config_file" << endl << endl; - exit(0); - } else { - cout << "Reading configuration file " << config_file << "..." << endl; - ifstream conf(config_file.c_str(), ios::in); - if(conf.fail()) { - cout << "Failed to read configuration file " << config_file << " - exiting" << endl; - exit(1); - } - bpo::store(bpo::parse_config_file(conf, common), vm); - bpo::notify(vm); + if (!config_exists(config_file, "epc.conf")) { + cout << "Failed to read ePC configuration file " << config_file << " - exiting" << endl; + exit(1); + } } - + //Parsing Config File + cout << "Reading configuration file " << config_file << "..." << endl; + ifstream conf(config_file.c_str(), ios::in); + if(conf.fail()) { + cout << "Failed to read configuration file " << config_file << " - exiting" << endl; + exit(1); + } + bpo::store(bpo::parse_config_file(conf, common), vm); + bpo::notify(vm); //Concert hex strings { @@ -246,6 +247,13 @@ parse_args(all_args_t *args, int argc, char* argv[]) { args->log_args.hss_hex_limit = args->log_args.all_hex_limit; } } + + // Check user database + if (!config_exists(args->hss_args.db_file, "user_db.csv")) { + cout << "Failed to read HSS user database file " << args->hss_args.db_file << " - exiting" << endl; + exit(1); + } + return; } diff --git a/srsepc/src/mbms-gw/main.cc b/srsepc/src/mbms-gw/main.cc index 379d56a36..a54f071c8 100644 --- a/srsepc/src/mbms-gw/main.cc +++ b/srsepc/src/mbms-gw/main.cc @@ -27,6 +27,7 @@ #include #include #include +#include "srslte/common/config_file.h" #include "srsepc/hdr/mbms-gw/mbms-gw.h" using namespace std; @@ -131,22 +132,24 @@ parse_args(all_args_t *args, int argc, char* argv[]) { exit(0); } - //Parsing Config File + // if no config file given, check users home path if (!vm.count("config_file")) { - cout << "Error: Configuration file not provided" << endl; - cout << "Usage: " << argv[0] << " [OPTIONS] config_file" << endl << endl; - exit(0); - } else { - cout << "Reading configuration file " << config_file << "..." << endl; - ifstream conf(config_file.c_str(), ios::in); - if(conf.fail()) { - cout << "Failed to read configuration file " << config_file << " - exiting" << endl; - exit(1); - } - bpo::store(bpo::parse_config_file(conf, common), vm); - bpo::notify(vm); + if (!config_exists(config_file, "mbms.conf")) { + cout << "Failed to read MBMS-GW configuration file " << config_file << " - exiting" << endl; + exit(1); + } } + //Parsing Config File + cout << "Reading configuration file " << config_file << "..." << endl; + ifstream conf(config_file.c_str(), ios::in); + if(conf.fail()) { + cout << "Failed to read configuration file " << config_file << " - exiting" << endl; + exit(1); + } + bpo::store(bpo::parse_config_file(conf, common), vm); + bpo::notify(vm); + args->mbms_gw_args.name = mbms_gw_name; args->mbms_gw_args.sgi_mb_if_addr = mbms_gw_sgi_mb_if_addr; args->mbms_gw_args.m1u_multi_addr = mbms_gw_m1u_multi_addr; diff --git a/srsepc/if_masq.sh b/srsepc/srsepc_if_masq.sh similarity index 100% rename from srsepc/if_masq.sh rename to srsepc/srsepc_if_masq.sh diff --git a/srsue/CMakeLists.txt b/srsue/CMakeLists.txt index 07a5f6b8f..2f9106827 100644 --- a/srsue/CMakeLists.txt +++ b/srsue/CMakeLists.txt @@ -44,3 +44,8 @@ link_directories( ######################################################################## add_subdirectory(src) add_subdirectory(test) + +######################################################################## +# Default configuration files +######################################################################## +install(FILES ue.conf.example DESTINATION ${DATA_DIR}) \ No newline at end of file diff --git a/srsue/src/main.cc b/srsue/src/main.cc index 759d1b739..bf624c432 100644 --- a/srsue/src/main.cc +++ b/srsue/src/main.cc @@ -37,6 +37,7 @@ #include #include "srsue/hdr/ue.h" +#include "srslte/common/config_file.h" #include "srslte/srslte.h" #include "srsue/hdr/metrics_stdout.h" #include "srsue/hdr/metrics_csv.h" @@ -79,8 +80,8 @@ void parse_args(all_args_t *args, int argc, char *argv[]) { ("rf.burst_preamble_us", bpo::value(&args->rf.burst_preamble)->default_value("auto"), "Transmission time advance") ("rf.continuous_tx", bpo::value(&args->rf.continuous_tx)->default_value("auto"), "Transmit samples continuously to the radio or on bursts (auto/yes/no). Default is auto (yes for UHD, no for rest)") - ("rrc.feature_group", bpo::value(&args->rrc.feature_group)->default_value(0xe6041c00), "Hex value of the featureGroupIndicators field in the" - "UECapabilityInformation message. Default 0xe6041c00") + ("rrc.feature_group", bpo::value(&args->rrc.feature_group)->default_value(0xe6041000), "Hex value of the featureGroupIndicators field in the" + "UECapabilityInformation message. Default 0xe6041000") ("rrc.ue_category", bpo::value(&args->ue_category_str)->default_value("4"), "UE Category (1 to 5)") ("nas.apn", bpo::value(&args->apn_name)->default_value(""), "Set Access Point Name (APN) for data services") @@ -128,7 +129,7 @@ void parse_args(all_args_t *args, int argc, char *argv[]) { ("usim.mode", bpo::value(&args->usim.mode)->default_value("soft"), "USIM mode (soft or pcsc)") ("usim.algo", bpo::value(&args->usim.algo), "USIM authentication algorithm") - ("usim.op", bpo::value(&args->usim.op), "USIM operator variant") + ("usim.opc", bpo::value(&args->usim.op), "USIM operator ciphered variant") ("usim.imsi", bpo::value(&args->usim.imsi), "USIM IMSI") ("usim.imei", bpo::value(&args->usim.imei), "USIM IMEI") ("usim.k", bpo::value(&args->usim.k), "USIM K") @@ -343,22 +344,24 @@ void parse_args(all_args_t *args, int argc, char *argv[]) { exit(0); } - // no config file given - print usage and exit + // if no config file given, check users home path if (!vm.count("config_file")) { - cout << "Error: Configuration file not provided" << endl; - cout << "Usage: " << argv[0] << " [OPTIONS] config_file" << endl << endl; - exit(0); - } else { - cout << "Reading configuration file " << config_file << "..." << endl; - ifstream conf(config_file.c_str(), ios::in); - if (conf.fail()) { - cout << "Failed to read configuration file " << config_file << " - exiting" << endl; + + if (!config_exists(config_file, "ue.conf")) { + cout << "Failed to read UE configuration file " << config_file << " - exiting" << endl; exit(1); } - bpo::store(bpo::parse_config_file(conf, common), vm); - bpo::notify(vm); } + cout << "Reading configuration file " << config_file << "..." << endl; + ifstream conf(config_file.c_str(), ios::in); + if (conf.fail()) { + cout << "Failed to read configuration file " << config_file << " - exiting" << endl; + exit(1); + } + bpo::store(bpo::parse_config_file(conf, common), vm); + bpo::notify(vm); + // Apply all_level to any unset layers if (vm.count("log.all_level")) { if (!vm.count("log.phy_level")) { @@ -532,8 +535,8 @@ int main(int argc, char *argv[]) if (args.gui.enable) { ue->start_plot(); } + // Auto-start MBMS service by default if(args.expert.mbms_service > -1){ - //ue->mbms_service_start(args.expert.mbms_service, 4321); serv = args.expert.mbms_service; port = 4321; mbms_service_start = true; @@ -541,6 +544,7 @@ int main(int argc, char *argv[]) } int cnt=0; while (running) { + // if(mbms_service_start) { if(ue->mbms_service_start(serv, port)){ mbms_service_start = false; @@ -550,18 +554,14 @@ int main(int argc, char *argv[]) show_mbms = false; ue->print_mbms(); } - sleep(1); if (args.expert.print_buffer_state) { cnt++; if (cnt==10) { cnt=0; ue->print_pool(); } - } else { - while (!ue->attach() && running) { - sleep(1); - } } + sleep(1); } pthread_cancel(input); metricshub.stop(); diff --git a/srsue/src/phy/phch_worker.cc b/srsue/src/phy/phch_worker.cc index 4c9ec1d58..e6e7727fd 100644 --- a/srsue/src/phy/phch_worker.cc +++ b/srsue/src/phy/phch_worker.cc @@ -819,6 +819,10 @@ int phch_worker::decode_pdsch(srslte_ra_dl_grant_t *grant, uint8_t *payload[SRSL // Store metrics dl_metrics.mcs = grant->mcs[0].idx; + float niters = srslte_pdsch_last_noi(&ue_dl.pdsch); + if (niters) { + dl_metrics.turbo_iters = niters; + } } else { Warning("Received grant for TBS=0\n"); } @@ -1636,7 +1640,6 @@ void phch_worker::update_measurements() dl_metrics.rssi = phy->avg_rssi_dbm; dl_metrics.pathloss = phy->pathloss; dl_metrics.sinr = phy->avg_snr_db_cqi; - dl_metrics.turbo_iters = srslte_pdsch_last_noi(&ue_dl.pdsch); phy->set_dl_metrics(dl_metrics); } diff --git a/srsue/src/ue.cc b/srsue/src/ue.cc index cd51781ea..6fa4bed6c 100644 --- a/srsue/src/ue.cc +++ b/srsue/src/ue.cc @@ -314,6 +314,7 @@ bool ue::get_metrics(ue_metrics_t &m) bzero(&rf_metrics, sizeof(rf_metrics_t)); rf_metrics.rf_error = false; // Reset error flag + bzero(&m, sizeof(ue_metrics_t)); if(EMM_STATE_REGISTERED == nas.get_state()) { if(RRC_STATE_CONNECTED == rrc.get_state()) { phy.get_metrics(m.phy); diff --git a/srsue/src/upper/nas.cc b/srsue/src/upper/nas.cc index 4df7d5c31..8bc8e5d12 100644 --- a/srsue/src/upper/nas.cc +++ b/srsue/src/upper/nas.cc @@ -732,6 +732,8 @@ void nas::parse_authentication_request(uint32_t lcid, byte_buffer_t *pdu) { // Deallocate PDU after parsing pool->deallocate(pdu); + ctxt.rx_count++; + // Generate authentication response using RAND, AUTN & KSI-ASME uint16 mcc, mnc; mcc = rrc->get_mcc(); diff --git a/srsue/src/upper/rrc.cc b/srsue/src/upper/rrc.cc index 587cb9d1b..a8d858da7 100644 --- a/srsue/src/upper/rrc.cc +++ b/srsue/src/upper/rrc.cc @@ -178,7 +178,7 @@ void rrc::init(phy_interface_rrc *phy_, args.ue_category = SRSLTE_UE_CATEGORY; args.supported_bands[0] = 7; args.nof_supported_bands = 1; - args.feature_group = 0xe6041c00; + args.feature_group = 0xe6041000; t300 = mac_timers->timer_get_unique_id(); t301 = mac_timers->timer_get_unique_id(); @@ -763,6 +763,7 @@ bool rrc::si_acquire(uint32_t sib_index) if ((uint32_t) sib1->sched_info[i].sib_mapping_info[j].sib_type == sib_index - 2) { period = liblte_rrc_si_periodicity_num[sib1->sched_info[i].si_periodicity]; sched_index = i; + found = true; } } } diff --git a/srsue/ue.conf.example b/srsue/ue.conf.example index 07c78d9ee..01169a474 100644 --- a/srsue/ue.conf.example +++ b/srsue/ue.conf.example @@ -88,7 +88,7 @@ file_max_size = -1 # # mode: USIM mode (soft/pcsc) # algo: Authentication algorithm (xor/milenage) -# op: 128-bit Operator Variant Algorithm Configuration Field (hex) +# opc: 128-bit Operator Ciphered Variant Algorithm Configuration Field (hex) # k: 128-bit subscriber key (hex) # imsi: 15 digit International Mobile Subscriber Identity # imei: 15 digit International Mobile Station Equipment Identity @@ -98,7 +98,7 @@ file_max_size = -1 [usim] mode = soft algo = xor -op = 63BFA50EE6523365FF14C1F45F88737D +opc = 63BFA50EE6523365FF14C1F45F88737D k = 00112233445566778899aabbccddeeff imsi = 001010123456789 imei = 353490069873319 @@ -110,11 +110,11 @@ imei = 353490069873319 # # ue_category: Sets UE category (range 1-5). Default: 4 # feature_group: Hex value of the featureGroupIndicators field in the -# UECapabilityInformation message. Default 0xe6041c00 +# UECapabilityInformation message. Default 0xe6041000 ##################################################################### [rrc] #ue_category = 4 -#feature_group = 0xe6041c00 +#feature_group = 0xe6041000 ##################################################################### # NAS configuration