<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12002">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remove OsmocomBB files (now avail in osmocom-bb.git)<br><br>Files were added in osmocom-bb.git Change-Id<br>I7d1226d3865da9595b730b716a8d4ba07be1e0d5<br><br>Depends: osmocom-bb.git Change-Id I7d1226d3865da9595b730b716a8d4ba07be1e0d5<br>Related: OS#3385<br>Change-Id: I5a4839be7a3122ab566023a3e7b3bc955db98ba4<br>---<br>M Makefile.am<br>D OsmocomBB/Makefile.am<br>D OsmocomBB/chapters/scripting.adoc<br>D OsmocomBB/osmocombb-usermanual-docinfo.xml<br>D OsmocomBB/osmocombb-usermanual.adoc<br>M configure.ac<br>6 files changed, 2 insertions(+), 203 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index 26a06a3..64623af 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -7,8 +7,7 @@</span><br><span> EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files)</span><br><span> SUBDIRS = tests \</span><br><span> OsmoMGCP \</span><br><span style="color: hsl(0, 100%, 40%);">- OsmoNAT \</span><br><span style="color: hsl(0, 100%, 40%);">- OsmocomBB</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoNAT</span><br><span> </span><br><span> $(top_srcdir)/.version:</span><br><span> echo $(VERSION) > $@-t && mv $@-t $@</span><br><span>diff --git a/OsmocomBB/Makefile.am b/OsmocomBB/Makefile.am</span><br><span>deleted file mode 100644</span><br><span>index 61ccafa..0000000</span><br><span>--- a/OsmocomBB/Makefile.am</span><br><span>+++ /dev/null</span><br><span>@@ -1,10 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-OSMO_GSM_MANUALS_DIR = $(top_srcdir)</span><br><span style="color: hsl(0, 100%, 40%);">-EXTRA_DIST = osmocombb-usermanual.adoc \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocombb-usermanual-docinfo.xml \</span><br><span style="color: hsl(0, 100%, 40%);">- chapters</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-ASCIIDOC = osmocombb-usermanual.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmocomBB/chapters/scripting.adoc b/OsmocomBB/chapters/scripting.adoc</span><br><span>deleted file mode 100644</span><br><span>index 8828a72..0000000</span><br><span>--- a/OsmocomBB/chapters/scripting.adoc</span><br><span>+++ /dev/null</span><br><span>@@ -1,111 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[[scripting]]</span><br><span style="color: hsl(0, 100%, 40%);">-== Scripting using Lua</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The mobile application can be extended using the</span><br><span style="color: hsl(0, 100%, 40%);">-https://www.lua.org/manual/5.3/[lua5.3 language].</span><br><span style="color: hsl(0, 100%, 40%);">-To use the scripting facility a script needs to be</span><br><span style="color: hsl(0, 100%, 40%);">-configured through the VTY interface and will be</span><br><span style="color: hsl(0, 100%, 40%);">-associated to a Mobile Station (MS). The script will</span><br><span style="color: hsl(0, 100%, 40%);">-then be able to interact with the specific MS.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-An event based programming model is to be used. This</span><br><span style="color: hsl(0, 100%, 40%);">-means that once the script has been loaded it should</span><br><span style="color: hsl(0, 100%, 40%);">-register to the wanted events, configure timers and</span><br><span style="color: hsl(0, 100%, 40%);">-return. When an event occurs the registered event</span><br><span style="color: hsl(0, 100%, 40%);">-handler will be executed.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The following describes the exported runtime services</span><br><span style="color: hsl(0, 100%, 40%);">-to be used in the script.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-=== Logging</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The logging functions allow to generate log messages</span><br><span style="color: hsl(0, 100%, 40%);">-for different levels. The log implementatiom is using</span><br><span style="color: hsl(0, 100%, 40%);">-the standard Osmocom logging framework which allows to</span><br><span style="color: hsl(0, 100%, 40%);">-have multiple log targets, e.g. syslog, file or through</span><br><span style="color: hsl(0, 100%, 40%);">-the VTY.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-|========</span><br><span style="color: hsl(0, 100%, 40%);">-|Code |Return | Explanation</span><br><span style="color: hsl(0, 100%, 40%);">-|print(...) |void | Print a message with log level 'debug'</span><br><span style="color: hsl(0, 100%, 40%);">-|log_debug(...) |void | Print a message with log level 'debug'</span><br><span style="color: hsl(0, 100%, 40%);">-|log_notice(...) |void | Print a message with log level 'notice'</span><br><span style="color: hsl(0, 100%, 40%);">-|log_error(...) |void | Print a message with log level 'error'</span><br><span style="color: hsl(0, 100%, 40%);">-|log_fatal(...) |void | Print a message with log level 'fatal'</span><br><span style="color: hsl(0, 100%, 40%);">-|========</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-==== Examples</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>-----</span><br><span style="color: hsl(0, 100%, 40%);">-Code:</span><br><span style="color: hsl(0, 100%, 40%);">-print("Log level 'debug'")</span><br><span style="color: hsl(0, 100%, 40%);">-log_debug("Log level 'debug'")</span><br><span style="color: hsl(0, 100%, 40%);">-log_notice("Log level 'notice'")</span><br><span style="color: hsl(0, 100%, 40%);">-log_error("Log level 'error'")</span><br><span style="color: hsl(0, 100%, 40%);">-log_fatal("Log level 'fatal'")</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Output:</span><br><span style="color: hsl(0, 100%, 40%);">-\<0011> @script.lua:1 Log level 'debug' </span><br><span style="color: hsl(0, 100%, 40%);">-\<0011> @script.lua:2 Log level 'debug' </span><br><span style="color: hsl(0, 100%, 40%);">-\<0011> @script.lua:3 Log level 'notice' </span><br><span style="color: hsl(0, 100%, 40%);">-\<0011> @script.lua:4 Log level 'error' </span><br><span style="color: hsl(0, 100%, 40%);">-\<0011> @script.lua:5 Log level 'fatal' </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>-----</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-=== Timer class</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The timer allows to invoke a function once after the requested</span><br><span style="color: hsl(0, 100%, 40%);">-timeout. The timer creation function will return immediately and</span><br><span style="color: hsl(0, 100%, 40%);">-the callback will be called after the timeout and when no other</span><br><span style="color: hsl(0, 100%, 40%);">-lua code is executing. The _osmo.timeout_ function should be used</span><br><span style="color: hsl(0, 100%, 40%);">-to create a new time, a running timer can be canneled using the _cancel_</span><br><span style="color: hsl(0, 100%, 40%);">-method.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-|========</span><br><span style="color: hsl(0, 100%, 40%);">-|Code |Return |Explanation</span><br><span style="color: hsl(0, 100%, 40%);">-|osmo.timeout(timeout, cb)|A new timer|Create a new non-recurring timer. Timeout should be in rounded seconds and cb should be a function.</span><br><span style="color: hsl(0, 100%, 40%);">-|timer.cancel() |Void |Cancel the timer, the callback will not be called.</span><br><span style="color: hsl(0, 100%, 40%);">-|========</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-==== Examples</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>-----</span><br><span style="color: hsl(0, 100%, 40%);">-Code:</span><br><span style="color: hsl(0, 100%, 40%);">-local timer = osmo.timeout(timeout_in_seconds, call_back)</span><br><span style="color: hsl(0, 100%, 40%);">-timer:cancel()</span><br><span>-----</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>-----</span><br><span style="color: hsl(0, 100%, 40%);">-Code:</span><br><span style="color: hsl(0, 100%, 40%);">-local timer = osmo.timeout(3, function()</span><br><span style="color: hsl(0, 100%, 40%);">- print("Timeout passed")</span><br><span style="color: hsl(0, 100%, 40%);">-end)</span><br><span style="color: hsl(0, 100%, 40%);">-print("Configured")</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Output:</span><br><span style="color: hsl(0, 100%, 40%);">-\<0011> @script.lua:4 Configured</span><br><span style="color: hsl(0, 100%, 40%);">-\<0011> @script.lua:2 Timeout passed</span><br><span>-----</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-=== MS class</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The MS singletong provides access to the Mobile Station configuration</span><br><span style="color: hsl(0, 100%, 40%);">-the script is associated with. This includes runtime information like</span><br><span style="color: hsl(0, 100%, 40%);">-the IMSI, IMEI or functions like start/stop.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-|========</span><br><span style="color: hsl(0, 100%, 40%);">-|Code |Return |Explanation</span><br><span style="color: hsl(0, 100%, 40%);">-|osmo.ms().imsi() |string |The IMSI. It might be invalid in case it has not been read from SIM card yet</span><br><span style="color: hsl(0, 100%, 40%);">-|osmo.ms().imei() |string |The configured IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-|========</span><br><span style="color: hsl(0, 100%, 40%);">-==== Examples</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>------</span><br><span style="color: hsl(0, 100%, 40%);">-Code:</span><br><span style="color: hsl(0, 100%, 40%);">-local ms = osmo.ms()</span><br><span style="color: hsl(0, 100%, 40%);">-print(ms.imei(), ms.imsi())</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Output:</span><br><span style="color: hsl(0, 100%, 40%);">-\<0011> @script.lua:2 126000000000000</span><br><span>------</span><br><span>diff --git a/OsmocomBB/osmocombb-usermanual-docinfo.xml b/OsmocomBB/osmocombb-usermanual-docinfo.xml</span><br><span>deleted file mode 100644</span><br><span>index 992a42e..0000000</span><br><span>--- a/OsmocomBB/osmocombb-usermanual-docinfo.xml</span><br><span>+++ /dev/null</span><br><span>@@ -1,57 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-<revhistory></span><br><span style="color: hsl(0, 100%, 40%);">- <revision></span><br><span style="color: hsl(0, 100%, 40%);">- <revnumber>1</revnumber></span><br><span style="color: hsl(0, 100%, 40%);">- <date>November 2017</date></span><br><span style="color: hsl(0, 100%, 40%);">- <authorinitials>HHPF</authorinitials></span><br><span style="color: hsl(0, 100%, 40%);">- <revremark></span><br><span style="color: hsl(0, 100%, 40%);">- Initial version.</span><br><span style="color: hsl(0, 100%, 40%);">- </revremark></span><br><span style="color: hsl(0, 100%, 40%);">- </revision></span><br><span style="color: hsl(0, 100%, 40%);">- </revhistory></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<authorgroup></span><br><span style="color: hsl(0, 100%, 40%);">- <author></span><br><span style="color: hsl(0, 100%, 40%);">- <firstname>Harald</firstname></span><br><span style="color: hsl(0, 100%, 40%);">- <surname>Welte</surname></span><br><span style="color: hsl(0, 100%, 40%);">- <email>hwelte@sysmocom.de</email></span><br><span style="color: hsl(0, 100%, 40%);">- <authorinitials>HW</authorinitials></span><br><span style="color: hsl(0, 100%, 40%);">- <affiliation></span><br><span style="color: hsl(0, 100%, 40%);">- <shortaffil>sysmocom</shortaffil></span><br><span style="color: hsl(0, 100%, 40%);">- <orgname>sysmocom - s.f.m.c. GmbH</orgname></span><br><span style="color: hsl(0, 100%, 40%);">- <jobtitle>Managing Director</jobtitle></span><br><span style="color: hsl(0, 100%, 40%);">- </affiliation></span><br><span style="color: hsl(0, 100%, 40%);">- </author></span><br><span style="color: hsl(0, 100%, 40%);">- <author></span><br><span style="color: hsl(0, 100%, 40%);">- <firstname>Holger</firstname></span><br><span style="color: hsl(0, 100%, 40%);">- <surname>Freyther</surname></span><br><span style="color: hsl(0, 100%, 40%);">- <email>hfreyther@sysmocom.de</email></span><br><span style="color: hsl(0, 100%, 40%);">- <authorinitials>HHPF</authorinitials></span><br><span style="color: hsl(0, 100%, 40%);">- <affiliation></span><br><span style="color: hsl(0, 100%, 40%);">- <shortaffil>sysmocom</shortaffil></span><br><span style="color: hsl(0, 100%, 40%);">- <orgname>sysmocom - s.f.m.c. GmbH</orgname></span><br><span style="color: hsl(0, 100%, 40%);">- <jobtitle>Co-Founder</jobtitle></span><br><span style="color: hsl(0, 100%, 40%);">- </affiliation></span><br><span style="color: hsl(0, 100%, 40%);">- </author></span><br><span style="color: hsl(0, 100%, 40%);">-</authorgroup></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<copyright></span><br><span style="color: hsl(0, 100%, 40%);">- <year>2013-2017</year></span><br><span style="color: hsl(0, 100%, 40%);">- <holder>sysmocom - s.f.m.c. GmbH</holder></span><br><span style="color: hsl(0, 100%, 40%);">-</copyright></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<legalnotice></span><br><span style="color: hsl(0, 100%, 40%);">- <para></span><br><span style="color: hsl(0, 100%, 40%);">- Permission is granted to copy, distribute and/or modify this</span><br><span style="color: hsl(0, 100%, 40%);">- document under the terms of the GNU Free Documentation License,</span><br><span style="color: hsl(0, 100%, 40%);">- Version 1.3 or any later version published by the Free Software</span><br><span style="color: hsl(0, 100%, 40%);">- Foundation; with no Invariant Sections, no Front-Cover Texts,</span><br><span style="color: hsl(0, 100%, 40%);">- and no Back-Cover Texts. A copy of the license is included in</span><br><span style="color: hsl(0, 100%, 40%);">- the section entitled "GNU Free Documentation License".</span><br><span style="color: hsl(0, 100%, 40%);">- </para></span><br><span style="color: hsl(0, 100%, 40%);">- <para></span><br><span style="color: hsl(0, 100%, 40%);">- The Asciidoc source code of this manual can be found at</span><br><span style="color: hsl(0, 100%, 40%);">- <ulink url="http://git.osmocom.org/osmo-gsm-manuals/"></span><br><span style="color: hsl(0, 100%, 40%);">- http://git.osmocom.org/osmo-gsm-manuals/</span><br><span style="color: hsl(0, 100%, 40%);">- </ulink></span><br><span style="color: hsl(0, 100%, 40%);">- </para></span><br><span style="color: hsl(0, 100%, 40%);">-</legalnotice></span><br><span>diff --git a/OsmocomBB/osmocombb-usermanual.adoc b/OsmocomBB/osmocombb-usermanual.adoc</span><br><span>deleted file mode 100644</span><br><span>index 024fc79..0000000</span><br><span>--- a/OsmocomBB/osmocombb-usermanual.adoc</span><br><span>+++ /dev/null</span><br><span>@@ -1,21 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-OsmocomBB User Manual</span><br><span style="color: hsl(0, 100%, 40%);">-=====================</span><br><span style="color: hsl(0, 100%, 40%);">-Holger Hans Peter Freyther <holger@moiji-mobile.com></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-include::./common/chapters/preface.adoc[]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-include::{srcdir}/chapters/scripting.adoc[]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-include::./common/chapters/vty.adoc[]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-include::./common/chapters/logging.adoc[]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-include::./common/chapters/port_numbers.adoc[]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-include::./common/chapters/bibliography.adoc[]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-include::./common/chapters/glossary.adoc[]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-include::./common/chapters/gfdl.adoc[]</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index cfd2971..764da31 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -29,5 +29,4 @@</span><br><span> Makefile</span><br><span> tests/Makefile</span><br><span> OsmoMGCP/Makefile</span><br><span style="color: hsl(0, 100%, 40%);">- OsmoNAT/Makefile</span><br><span style="color: hsl(0, 100%, 40%);">- OsmocomBB/Makefile)</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoNAT/Makefile)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12002">change 12002</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12002"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-manuals </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5a4839be7a3122ab566023a3e7b3bc955db98ba4 </div>
<div style="display:none"> Gerrit-Change-Number: 12002 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>