openbsc.git tag sysmocom/iu_orig_history created. 0.15.0-513-g6950d14

gitosis at osmocom.org gitosis at osmocom.org
Fri Jun 17 18:24:40 UTC 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)".

The tag, sysmocom/iu_orig_history has been created
        at  6950d14c5bf301fbb3061f5a4fe67f5f57b76040 (commit)

- Log -----------------------------------------------------------------
commit 6950d14c5bf301fbb3061f5a4fe67f5f57b76040
Merge: cf2ca64 cd5e526
Author: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Date:   Sun May 8 23:25:31 2016 +0200

    Merge branch 'master' into sysmocom/iu, with tweaks
    
    Numerous manual adjustments are included to make sense on the sysmocom/iu branch:
    
    * gsm_04_08_gprs.h has moved to libosmocore on the master branch, but
      sysmocom/iu has added some entries. Until it is clear whether to move the
      additions to libosmocore as well, keep gsm_04_08_gprs.h on sysmocom/iu with
      merely the additions.
    * Thus, keep using the old gsm_04_08_gprs.[hc] from openbsc in the Makefiles,
      but only where the sysmocom/iu additions are needed.
    * In openbsc's gsm_04_08_gprs.h,
      * include the libosmocore gsm_04_08_gprs.h,
      * use '#pragma once' instead of #ifndef and
      * add a TODO comment about moving the rest to libosmocore.
    
    * Apply the addition of an osmo_auth_vector to gsm_auth_tuple: in the Iu auth
      vector hacks, use the gsm_auth_tuple.vec instead of a local struct.
      See iu_hack__get_hardcoded_auth_tuple() and gsm48_rx_gmm_att_req().
    
    * In the si2q tests, pass NULL as ctx to gsm_network_init().
    
    * In cscn_main.c, add a debug log that was originally added to osmo-nitb.
    
    * openbsc/.gitignore: keep only one addition of 'writtenconfig'
    
    Conflicts:
    	openbsc/include/openbsc/gprs_sgsn.h
    	openbsc/include/openbsc/gsm_04_08_gprs.h
    	openbsc/src/gprs/gsm_04_08_gprs.c
    	openbsc/src/libmsc/gsm_04_08.c
    	openbsc/src/osmo-cscn/cscn_main.c
    	openbsc/tests/gsm0408/Makefile.am
-----------------------------------------------------------------------


hooks/post-receive
-- 
The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)



More information about the osmocom-commitlog mailing list