February 2022 - gerrit-log - lists.osmocom.org

Change in docker-playground[master]: common/pipework: deduplicate

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27159 ) Change subject: common/pipework: deduplicate ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I88ff40ca69c9ee76bef9bb8f24f66ca9d5ac751a Gerrit-Change-Number: 27159 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:00:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: make/Makefile: always use docker run --rm

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27158 ) Change subject: make/Makefile: always use docker run --rm ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iea063aa39a08397ea64d2018b433991a130e7f56 Gerrit-Change-Number: 27158 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 14:59:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in pysim[master]: tlv: Function for flattening the list-of-dict output of TLV decoder

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27163 ) Change subject: tlv: Function for flattening the list-of-dict output of TLV decoder ...................................................................... tlv: Function for flattening the list-of-dict output of TLV decoder Before: { "FcpTemplate": [ { "FileDescriptor": { "shareable": true, "file_type": "df", "structure": "no_info_given" } }, { "FileIdentifier": "3f00" }, { "ProprietaryInformation": [ { "UiccCharacteristics": "71" }, { "AvailableMemory": 123052 } ] }, { "LifeCycleStatusInteger": "operational_activated" }, { "SecurityAttribReferenced": { "ef_arr_file_id": "2f06", "ef_arr_record_nr": 2 } }, { "PinStatusTemplate_DO": [ { "PS_DO": "40" }, { "KeyReference": 1 }, { "KeyReference": 129 } ] }, { "TotalFileSize": 187809 } ] } After: { "FcpTemplate": { "FileDescriptor": { "shareable": true, "file_type": "df", "structure": "no_info_given" }, "FileIdentifier": "3f00", "ProprietaryInformation": { "UiccCharacteristics": "71", "AvailableMemory": 123052 }, "LifeCycleStatusInteger": "operational_activated", "SecurityAttribReferenced": { "ef_arr_file_id": "2f06", "ef_arr_record_nr": 2 }, "PinStatusTemplate_DO": { "PS_DO": "40", "KeyReference": 129 }, "TotalFileSize": 187809 } } Change-Id: Ia5ad8f1d3b0d47ebdb1856b0feaba120bad3eef9 --- M pySim/tlv.py M pySim/ts_102_221.py 2 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/27163/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index ba1aa9f..71338ab 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -404,3 +404,30 @@ def to_tlv(self): return self.to_bytes() + + +def flatten_dict_lists(inp): + """hierarchically flatten each list-of-dicts into a single dict. This is useful to + make the output of hierarchical TLV decoder structures flatter and more easy to read.""" + def are_all_elements_dict(l): + for e in l: + if not isinstance(e, dict): + return False + return True + + if isinstance(inp, list): + if are_all_elements_dict(inp): + # flatten into one shared dict + newdict = {} + for e in inp: + key = list(e.keys())[0] + newdict[key] = e[key] + inp = newdict + # process result as any native dict + return {k:flatten_dict_lists(inp[k]) for k in inp.keys()} + else: + return [flatten_dict_lists(x) for x in inp] + elif isinstance(inp, dict): + return {k:flatten_dict_lists(inp[k]) for k in inp.keys()} + else: + return inp diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index b9a94b7..3f8c49d 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -794,7 +794,7 @@ """ETSI TS 102 221 Section 11.1.1.3""" t = FcpTemplate() t.from_tlv(h2b(resp_hex)) - return t.to_dict() + return flatten_dict_lists(t.to_dict()) @staticmethod def match_with_card(scc: SimCardCommands) -> bool: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia5ad8f1d3b0d47ebdb1856b0feaba120bad3eef9 Gerrit-Change-Number: 27163 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: pySim-shell: export: allow export as JSON instead of hex

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27164 ) Change subject: pySim-shell: export: allow export as JSON instead of hex ...................................................................... pySim-shell: export: allow export as JSON instead of hex The primary use case of the --json option is to systematically execute all of our decoder classes in order to find bugs. As we don't have encoders for all files yet, the output generated by 'export --json' will in many cases not be executable as script again, unlike the normal 'export' output. Change-Id: Idd820f8e3af70ebcbf82037b56fd2ae9655afbc5 --- M pySim-shell.py 1 file changed, 27 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/27164/1 diff --git a/pySim-shell.py b/pySim-shell.py index 6bbe9ed..875dd64 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -457,7 +457,7 @@ self._cmd.poutput(directory_str) self._cmd.poutput("%d files" % len(selectables)) - def walk(self, indent=0, action=None, context=None): + def walk(self, indent=0, action=None, context=None, as_json=False): """Recursively walk through the file system, starting at the currently selected DF""" files = self._cmd.rs.selected_file.get_selectables( flags=['FNAMES', 'ANAMES']) @@ -489,12 +489,12 @@ # If the DF was skipped, we never have entered the directory # below, so we must not move up. if skip_df == False: - self.walk(indent + 1, action, context) + self.walk(indent + 1, action, context, as_json) fcp_dec = self._cmd.rs.select("..", self._cmd) elif action: df_before_action = self._cmd.rs.selected_file - action(f, context) + action(f, context, as_json) # When walking through the file system tree the action must not # always restore the currently selected file to the file that # was selected before executing the action() callback. @@ -506,7 +506,7 @@ """Display a filesystem-tree with all selectable files""" self.walk() - def export(self, filename, context): + def export(self, filename, context, as_json=False): """ Select and export a single file """ context['COUNT'] += 1 df = self._cmd.rs.selected_file @@ -537,23 +537,36 @@ self._cmd.poutput("select " + self._cmd.rs.selected_file.name) if structure == 'transparent': - result = self._cmd.rs.read_binary() - self._cmd.poutput("update_binary " + str(result[0])) + if as_json: + result = self._cmd.rs.read_binary_dec() + self._cmd.poutput("update_binary_decoded '%s'" % json.dumps(result[0], cls=JsonEncoder)) + else: + result = self._cmd.rs.read_binary() + self._cmd.poutput("update_binary " + str(result[0])) elif structure == 'cyclic' or structure == 'linear_fixed': # Use number of records specified in select response if 'num_of_rec' in fd: num_of_rec = fd['num_of_rec'] for r in range(1, num_of_rec + 1): - result = self._cmd.rs.read_record(r) - self._cmd.poutput("update_record %d %s" % - (r, str(result[0]))) + if as_json: + result = self._cmd.rs.read_record(r) + self._cmd.poutput("update_record_decoded %d '%s'" % (r, json.dumps(result[0], cls=JsonEncoder))) + else: + result = self._cmd.rs.read_record_dec(r) + self._cmd.poutput("update_record %d %s" % (r, str(result[0]))) + # When the select response does not return the number of records, read until we hit the # first record that cannot be read. else: r = 1 while True: try: - result = self._cmd.rs.read_record(r) + if as_json: + result = self._cmd.rs.read_record_dec(r) + self._cmd.poutput("update_record_decoded %d '%s'" % (r, json.dumps(result[0], cls=JsonEncoder))) + else: + result = self._cmd.rs.read_record(r) + self._cmd.poutput("update_record %d %s" % (r, str(result[0]))) except SwMatchError as e: # We are past the last valid record - stop if e.sw_actual == "9402": @@ -561,8 +574,6 @@ # Some other problem occurred else: raise e - self._cmd.poutput("update_record %d %s" % - (r, str(result[0]))) r = r + 1 elif structure == 'ber_tlv': tags = self._cmd.rs.retrieve_tags() @@ -591,6 +602,8 @@ export_parser = argparse.ArgumentParser() export_parser.add_argument( '--filename', type=str, default=None, help='only export specific file') + export_parser.add_argument( + '--json', action='store_true', help='export as JSON (less reliable)') @cmd2.with_argparser(export_parser) def do_export(self, opts): @@ -598,9 +611,9 @@ context = {'ERR': 0, 'COUNT': 0, 'BAD': [], 'DF_SKIP': 0, 'DF_SKIP_REASON': []} if opts.filename: - self.export(opts.filename, context) + self.export(opts.filename, context, opts.json) else: - self.walk(0, self.export, context) + self.walk(0, self.export, context, opts.json) self._cmd.poutput(boxed_heading_str("Export summary")) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Idd820f8e3af70ebcbf82037b56fd2ae9655afbc5 Gerrit-Change-Number: 27164 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: ts_102_221: Proper parsing of FCP using pySim.tlv instead of pytlv

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27162 ) Change subject: ts_102_221: Proper parsing of FCP using pySim.tlv instead of pytlv ...................................................................... ts_102_221: Proper parsing of FCP using pySim.tlv instead of pytlv pytlv is a nightmare of shortcomings, let's abandon it in favor of our own meanwhile-created pySim.tlv. This has the added benefit that unknown tags finally no longer raise exceptions. Change-Id: Ic8e0e0ddf915949670d620630d4ceb02a9116471 Closes: OS#5414 --- M pySim/ts_102_221.py 1 file changed, 183 insertions(+), 164 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/62/27162/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index da4eb93..b9a94b7 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ -from pytlv.TLV import * from construct import * from pySim.construct import * from pySim.utils import * @@ -78,131 +77,196 @@ CardCommand('RESIZE FILE', 0xD4, ['8X', 'CX']), ]) +# TS 102 221 Section 9.5.1 / Table 9.3 +pin_names = bidict({ + 0x01: 'PIN1', + 0x02: 'PIN2', + 0x03: 'PIN3', + 0x04: 'PIN4', + 0x05: 'PIN5', + 0x06: 'PIN6', + 0x07: 'PIN7', + 0x08: 'PIN8', + 0x0a: 'ADM1', + 0x0b: 'ADM2', + 0x0c: 'ADM3', + 0x0d: 'ADM4', + 0x0e: 'ADM5', -FCP_TLV_MAP = { - '82': 'file_descriptor', - '83': 'file_identifier', - '84': 'df_name', - 'A5': 'proprietary_info', - '8A': 'life_cycle_status_int', - '8B': 'security_attrib_ref_expanded', - '8C': 'security_attrib_compact', - 'AB': 'security_attrib_espanded', - 'C6': 'pin_status_template_do', - '80': 'file_size', - '81': 'total_file_size', - '88': 'short_file_id', -} + 0x11: 'UNIVERSAL_PIN', + 0x81: '2PIN1', + 0x82: '2PIN2', + 0x83: '2PIN3', + 0x84: '2PIN4', + 0x85: '2PIN5', + 0x86: '2PIN6', + 0x87: '2PIN7', + 0x88: '2PIN8', + 0x8a: 'ADM6', + 0x8b: 'ADM7', + 0x8c: 'ADM8', + 0x8d: 'ADM9', + 0x8e: 'ADM10', +}) -# ETSI TS 102 221 11.1.1.4.6 -FCP_Proprietary_TLV_MAP = { - '80': 'uicc_characteristics', - '81': 'application_power_consumption', - '82': 'minimum_app_clock_freq', - '83': 'available_memory', - '84': 'file_details', - '85': 'reserved_file_size', - '86': 'maximum_file_size', - '87': 'suported_system_commands', - '88': 'specific_uicc_env_cond', - '89': 'p2p_cat_secured_apdu', - # Additional private TLV objects (bits b7 and b8 of the first byte of the tag set to '1') -} +# ETSI TS 102 221 11.1.1.4.2 +class FileSize(BER_TLV_IE, tag=0x80): + # FIXME: variable-length integer + _construct = BytesInteger(4) + +# ETSI TS 102 221 11.1.1.4.2 +class TotalFileSize(BER_TLV_IE, tag=0x81): + # FIXME: variable-length integer + _construct = BytesInteger(4) # ETSI TS 102 221 11.1.1.4.3 +class FileDescriptor(BER_TLV_IE, tag=0x82): + def _from_bytes(self, in_bin: bytes): + out = {} + ft_dict = { + 0: 'working_ef', + 1: 'internal_ef', + 7: 'df' + } + fs_dict = { + 0: 'no_info_given', + 1: 'transparent', + 2: 'linear_fixed', + 6: 'cyclic', + 0x39: 'ber_tlv', + } + fdb = in_bin[0] + ftype = (fdb >> 3) & 7 + if fdb & 0xbf == 0x39: + fstruct = 0x39 + else: + fstruct = fdb & 7 + out['shareable'] = True if fdb & 0x40 else False + out['file_type'] = ft_dict[ftype] if ftype in ft_dict else ftype + out['structure'] = fs_dict[fstruct] if fstruct in fs_dict else fstruct + if len(in_bin) >= 5: + out['record_len'] = int.from_bytes(in_bin[2:4], 'big') + out['num_of_rec'] = int.from_bytes(in_bin[4:5], 'big') + self.decoded = out + return self.decoded +# ETSI TS 102 221 11.1.1.4.4 +class FileIdentifier(BER_TLV_IE, tag=0x83): + _construct = GreedyBytes -def interpret_file_descriptor(in_hex): - in_bin = h2b(in_hex) - out = {} - ft_dict = { - 0: 'working_ef', - 1: 'internal_ef', - 7: 'df' - } - fs_dict = { - 0: 'no_info_given', - 1: 'transparent', - 2: 'linear_fixed', - 6: 'cyclic', - 0x39: 'ber_tlv', - } - fdb = in_bin[0] - ftype = (fdb >> 3) & 7 - if fdb & 0xbf == 0x39: - fstruct = 0x39 - else: - fstruct = fdb & 7 - out['shareable'] = True if fdb & 0x40 else False - out['file_type'] = ft_dict[ftype] if ftype in ft_dict else ftype - out['structure'] = fs_dict[fstruct] if fstruct in fs_dict else fstruct - if len(in_bin) >= 5: - out['record_len'] = int.from_bytes(in_bin[2:4], 'big') - out['num_of_rec'] = int.from_bytes(in_bin[4:5], 'big') - return out +# ETSI TS 102 221 11.1.1.4.5 +class DfName(BER_TLV_IE, tag=0x84): + _construct = GreedyBytes + +# ETSI TS 102 221 11.1.1.4.6.1 +class UiccCharacteristics(BER_TLV_IE, tag=0x80): + _construct = GreedyBytes + +# ETSI TS 102 221 11.1.1.4.6.2 +class ApplicationPowerConsumption(BER_TLV_IE, tag=0x81): + _construct = Struct('voltage_class'/Int8ub, + 'power_consumption_ma'/Int8ub, + 'reference_freq_100k'/Int8ub) + +# ETSI TS 102 221 11.1.1.4.6.3 +class MinApplicationClockFrequency(BER_TLV_IE, tag=0x82): + _construct = Int8ub + +# ETSI TS 102 221 11.1.1.4.6.4 +class AvailableMemory(BER_TLV_IE, tag=0x83): + # FIXME: variable-length integer + _construct = BytesInteger(4) + +# ETSI TS 102 221 11.1.1.4.6.5 +class FileDetails(BER_TLV_IE, tag=0x84): + _construct = FlagsEnum(Byte, der_coding_only=1) + +# ETSI TS 102 221 11.1.1.4.6.6 +class ReservedFileSize(BER_TLV_IE, tag=0x85): + # FIXME: variable-length integer + _construct = BytesInteger(4) + +# ETSI TS 102 221 11.1.1.4.6.7 +class MaximumFileSize(BER_TLV_IE, tag=0x86): + # FIXME: variable-length integer + _construct = BytesInteger(4) + +# ETSI TS 102 221 11.1.1.4.6.8 +class SupportedFilesystemCommands(BER_TLV_IE, tag=0x87): + _construct = FlagsEnum(Byte, terminal_capability=1) + +# ETSI TS 102 221 11.1.1.4.6.9 +class SpecificUiccEnvironmentConditions(BER_TLV_IE, tag=0x88): + _construct = BitStruct('rfu'/BitsRFU(4), + 'high_humidity_supported'/Flag, + 'temperature_class'/Enum(BitsInteger(3), standard=0, class_A=1, class_B=2, class_C=3)) + +# ETSI TS 102 221 11.1.1.4.6.10 +class Platform2PlatformCatSecuredApdu(BER_TLV_IE, tag=0x89): + _construct = GreedyBytes + +# ETSI TS 102 221 11.1.1.4.6.0 +class ProprietaryInformation(BER_TLV_IE, tag=0xA5, + nested=[UiccCharacteristics, ApplicationPowerConsumption, + MinApplicationClockFrequency, AvailableMemory, + FileDetails, ReservedFileSize, MaximumFileSize, + SupportedFilesystemCommands, SpecificUiccEnvironmentConditions]): + pass + +# ETSI TS 102 221 11.1.1.4.7.1 +class SecurityAttribCompact(BER_TLV_IE, tag=0x8c): + _construct = GreedyBytes + +# ETSI TS 102 221 11.1.1.4.7.2 +class SecurityAttribExpanded(BER_TLV_IE, tag=0xab): + _construct = GreedyBytes + +# ETSI TS 102 221 11.1.1.4.7.3 +class SecurityAttribReferenced(BER_TLV_IE, tag=0x8b): + # TODO: longer format with SEID + _construct = Struct('ef_arr_file_id'/Bytes(2), 'ef_arr_record_nr'/Int8ub) + +# ETSI TS 102 221 11.1.1.4.8 +class ShortFileIdentifier(BER_TLV_IE, tag=0x88): + _construct = Byte # ETSI TS 102 221 11.1.1.4.9 +class LifeCycleStatusInteger(BER_TLV_IE, tag=0x8A): + def _from_bytes(self, do: bytes): + lcsi = int.from_bytes(do, 'big') + if lcsi == 0x00: + ret = 'no_information' + elif lcsi == 0x01: + ret = 'creation' + elif lcsi == 0x03: + ret = 'initialization' + elif lcsi & 0x05 == 0x05: + ret = 'operational_activated' + elif lcsi & 0x05 == 0x04: + ret = 'operational_deactivated' + elif lcsi & 0xc0 == 0xc0: + ret = 'termination' + else: + ret = lcsi + self.decoded = ret + return self.decoded +# ETSI TS 102 221 11.1.1.4.9 +class PS_DO(BER_TLV_IE, tag=0x90): + _construct = GreedyBytes +class UsageQualifier_DO(BER_TLV_IE, tag=0x95): + _construct = GreedyBytes +class KeyReference(BER_TLV_IE, tag=0x83): + _construct = Byte +class PinStatusTemplate_DO(BER_TLV_IE, tag=0xC6, nested=[PS_DO, UsageQualifier_DO, KeyReference]): + pass -def interpret_life_cycle_sts_int(in_hex): - lcsi = int(in_hex, 16) - if lcsi == 0x00: - return 'no_information' - elif lcsi == 0x01: - return 'creation' - elif lcsi == 0x03: - return 'initialization' - elif lcsi & 0x05 == 0x05: - return 'operational_activated' - elif lcsi & 0x05 == 0x04: - return 'operational_deactivated' - elif lcsi & 0xc0 == 0xc0: - return 'termination' - else: - return in_hex - - -# ETSI TS 102 221 11.1.1.4.10 -FCP_Pin_Status_TLV_MAP = { - '90': 'ps_do', - '95': 'usage_qualifier', - '83': 'key_reference', -} - - -def interpret_ps_templ_do(in_hex): - # cannot use the 'TLV' parser due to repeating tags - #psdo_tlv = TLV(FCP_Pin_Status_TLV_MAP) - # return psdo_tlv.parse(in_hex) - return in_hex - - -# 'interpreter' functions for each tag -FCP_interpreter_map = { - '80': lambda x: int(x, 16), - '82': interpret_file_descriptor, - '8A': interpret_life_cycle_sts_int, - 'C6': interpret_ps_templ_do, -} - -FCP_prorietary_interpreter_map = { - '83': lambda x: int(x, 16), -} - -# pytlv unfortunately doesn't have a setting using which we can make it -# accept unknown tags. It also doesn't raise a specific exception type but -# just the generic ValueError, so we cannot ignore those either. Instead, -# we insert a dict entry for every possible proprietary tag permitted - - -def fixup_fcp_proprietary_tlv_map(tlv_map): - if 'D0' in tlv_map: - return - for i in range(0xc0, 0xff): - i_hex = i2h([i]).upper() - tlv_map[i_hex] = 'proprietary_' + i_hex - # Other non-standard TLV objects found on some cards - tlv_map['9B'] = 'target_ef' # for sysmoUSIM-SJS1 +class FcpTemplate(BER_TLV_IE, tag=0x62, nested=[FileSize, TotalFileSize, FileDescriptor, FileIdentifier, + DfName, ProprietaryInformation, SecurityAttribCompact, + SecurityAttribExpanded, SecurityAttribReferenced, + ShortFileIdentifier, LifeCycleStatusInteger, + PinStatusTemplate_DO]): + pass def tlv_key_replace(inmap, indata): @@ -378,37 +442,6 @@ AM_DO_EF = AM_DO_CHDR | _AM_DO_EF() -# TS 102 221 Section 9.5.1 / Table 9.3 -pin_names = bidict({ - 0x01: 'PIN1', - 0x02: 'PIN2', - 0x03: 'PIN3', - 0x04: 'PIN4', - 0x05: 'PIN5', - 0x06: 'PIN6', - 0x07: 'PIN7', - 0x08: 'PIN8', - 0x0a: 'ADM1', - 0x0b: 'ADM2', - 0x0c: 'ADM3', - 0x0d: 'ADM4', - 0x0e: 'ADM5', - - 0x11: 'UNIVERSAL_PIN', - 0x81: '2PIN1', - 0x82: '2PIN2', - 0x83: '2PIN3', - 0x84: '2PIN4', - 0x85: '2PIN5', - 0x86: '2PIN6', - 0x87: '2PIN7', - 0x88: '2PIN8', - 0x8a: 'ADM6', - 0x8b: 'ADM7', - 0x8c: 'ADM8', - 0x8d: 'ADM9', - 0x8e: 'ADM10', -}) class CRT_DO(DataObject): @@ -759,23 +792,9 @@ @staticmethod def decode_select_response(resp_hex: str) -> object: """ETSI TS 102 221 Section 11.1.1.3""" - fixup_fcp_proprietary_tlv_map(FCP_Proprietary_TLV_MAP) - resp_hex = resp_hex.upper() - # outer layer - fcp_base_tlv = TLV(['62']) - fcp_base = fcp_base_tlv.parse(resp_hex) - # actual FCP - fcp_tlv = TLV(FCP_TLV_MAP) - fcp = fcp_tlv.parse(fcp_base['62']) - # further decode the proprietary information - if 'A5' in fcp: - prop_tlv = TLV(FCP_Proprietary_TLV_MAP) - prop = prop_tlv.parse(fcp['A5']) - fcp['A5'] = tlv_val_interpret(FCP_prorietary_interpreter_map, prop) - fcp['A5'] = tlv_key_replace(FCP_Proprietary_TLV_MAP, fcp['A5']) - # finally make sure we get human-readable keys in the output dict - r = tlv_val_interpret(FCP_interpreter_map, fcp) - return tlv_key_replace(FCP_TLV_MAP, r) + t = FcpTemplate() + t.from_tlv(h2b(resp_hex)) + return t.to_dict() @staticmethod def match_with_card(scc: SimCardCommands) -> bool: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic8e0e0ddf915949670d620630d4ceb02a9116471 Gerrit-Change-Number: 27162 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: scripts/docker-cleanup.sh: conditional img clean

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/27156 to look at the new patch set (#2). Change subject: scripts/docker-cleanup.sh: conditional img clean ...................................................................... scripts/docker-cleanup.sh: conditional img clean Only run the simple image clean code if docuum is not running. It works well enough in most cases, but has the drawbacks that it never deletes "latest" images or images not matching "^osmocom-build", and may delete images that are still being used (OS#5447). With the other tool, all images are considered for removal, and the ones that have not been used the longest time are removed first. Related: OS#5477, OS#5066, SYS#5827 Change-Id: I1cef0833c096de0fa5acf77156bb5dd362e2ef9c --- M scripts/docker-cleanup.sh 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/56/27156/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1cef0833c096de0fa5acf77156bb5dd362e2ef9c Gerrit-Change-Number: 27156 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-lint: run on docker-playground too

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27161 ) Change subject: jobs/gerrit-lint: run on docker-playground too ...................................................................... jobs/gerrit-lint: run on docker-playground too Change-Id: I7213155ccd61a006231609b1d7ae1eec187b3e7b --- M jobs/gerrit-lint.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/27161/1 diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 8148ca2..69b1c0e 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -15,6 +15,7 @@ - asn1c - cellmgr-ng - dahdi-linux + - docker-playground - libasn1c - libgtpnl - libosmo-abis -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7213155ccd61a006231609b1d7ae1eec187b3e7b Gerrit-Change-Number: 27161 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Add f_ran_register_exp()

by daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27109 ) Change subject: RAN_Emulation: Add f_ran_register_exp() ...................................................................... RAN_Emulation: Add f_ran_register_exp() For some reason this helper function was misssing; we only had the version to register an imsi. Change-Id: I9d38dbdf589ed0f5999a5aeeb31b10ca5d07de16 --- M library/RAN_Emulation.ttcnpp 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 9873245..295876e 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -1442,6 +1442,13 @@ } } +/* register an expect with the BSSMAP core */ +function f_ran_register_exp(octetstring l3_enc) runs on RAN_ConnHdlr { + BSSAP_PROC.call(RAN_register:{l3_enc, self}) { + [] BSSAP_PROC.getreply(RAN_register:{?, ?}) {}; + } +} + #ifdef RAN_EMULATION_RANAP /* expect a IuReleaseCommand; Confirm that; expect SCCP-level N-DISCONNET.ind */ altstep as_iu_release_compl_disc(float t := 5.0) runs on RAN_ConnHdlr { 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9d38dbdf589ed0f5999a5aeeb31b10ca5d07de16 Gerrit-Change-Number: 27109 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: treewide: fix missing --rm for "docker run"

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27160 ) Change subject: treewide: fix missing --rm for "docker run" ...................................................................... treewide: fix missing --rm for "docker run" Add "--rm" to each "docker run" command, so they don't continuously fill up disk space. Fix this even in the pipework script. We don't use the code path there, but by always having --rm after "docker run" (same line or next line), a new lint script in osmo-ci I8ab9c291504475d670bdefc50c4524c5bdd4c880 can help us avoid this in the future. Related: SYS#5827, OS#5099 Change-Id: I48b01c43fedf379b8a565eaab0369806d7831bd8 --- M common/pipework M jenkins-common.sh M ttcn3-fr-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh 4 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/60/27160/1 diff --git a/common/pipework b/common/pipework index 97ce66b..1381aa9 100755 --- a/common/pipework +++ b/common/pipework @@ -423,7 +423,7 @@ # use a locally installed client. case "$DHCP_CLIENT" in dhcp) - docker run -d --net container:$GUESTNAME --cap-add NET_ADMIN \ + docker run --rm -d --net container:$GUESTNAME --cap-add NET_ADMIN \ busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \ $DHCP_OPTIONS \ >/dev/null diff --git a/jenkins-common.sh b/jenkins-common.sh index 3faf6a9..5571dd1 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -326,6 +326,7 @@ "$CACHE_DIR/kernel-test/initrd-project-script.sh" docker run \ + --rm \ --cap-add=NET_ADMIN \ $(docker_kvm_param) \ --device /dev/net/tun:/dev/net/tun \ diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 6dbc6f1..34aa740 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -25,6 +25,7 @@ echo Starting container with FRNET docker run \ + --rm \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ @@ -44,6 +45,7 @@ echo Starting container with FR testsuite docker run \ + --rm \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 53da74d..ad160b4 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -55,7 +55,8 @@ " OSMO_SUT_HOST="172.18.$SUBNET.201" fi -docker run --cap-add=NET_ADMIN \ +docker run --rm \ + --cap-add=NET_ADMIN \ --device /dev/net/tun:/dev/net/tun \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --rm \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I48b01c43fedf379b8a565eaab0369806d7831bd8 Gerrit-Change-Number: 27160 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: common/pipework: deduplicate

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27159 ) Change subject: common/pipework: deduplicate ...................................................................... common/pipework: deduplicate Move the pipework script from several image directories to the common dir. Change-Id: I88ff40ca69c9ee76bef9bb8f24f66ca9d5ac751a --- R common/pipework M debian-bullseye-titan/Dockerfile M osmo-gbproxy-latest/Dockerfile D osmo-gbproxy-latest/pipework M osmo-gbproxy-master/Dockerfile D osmo-gbproxy-master/pipework M osmo-ns-master/Dockerfile D osmo-ns-master/pipework 8 files changed, 4 insertions(+), 1,471 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/59/27159/1 diff --git a/debian-bullseye-titan/pipework b/common/pipework similarity index 100% rename from debian-bullseye-titan/pipework rename to common/pipework diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index b4b6532..16b25b9 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -70,4 +70,4 @@ ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare ADD ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run -ADD pipework /usr/local/bin/pipework +ADD .common/pipework /usr/local/bin/pipework diff --git a/osmo-gbproxy-latest/Dockerfile b/osmo-gbproxy-latest/Dockerfile index 5e16f99..6f58663 100644 --- a/osmo-gbproxy-latest/Dockerfile +++ b/osmo-gbproxy-latest/Dockerfile @@ -31,7 +31,7 @@ # work-around for stupid docker not being able to properly deal with host netdevices or start # containers in pre-existing netns -COPY pipework /usr/bin/pipework +COPY .common/pipework /usr/bin/pipework COPY docker-entrypoint.sh /docker-entrypoint.sh CMD ["/docker-entrypoint.sh"] diff --git a/osmo-gbproxy-latest/pipework b/osmo-gbproxy-latest/pipework deleted file mode 100755 index 97ce66b..0000000 --- a/osmo-gbproxy-latest/pipework +++ /dev/null @@ -1,489 +0,0 @@ -#!/bin/sh -# This code should (try to) follow Google's Shell Style Guide -# (https://google.github.io/styleguide/shell.xml) -set -e - -case "$1" in - --wait) - WAIT=1 - ;; - --direct-phys) - DIRECT_PHYS=1 - shift - ;; -esac - -IFNAME=$1 - -# default value set further down if not set here -CONTAINER_IFNAME= -if [ "$2" = "-i" ]; then - CONTAINER_IFNAME=$3 - shift 2 -fi - -if [ "$2" = "-l" ]; then - LOCAL_IFNAME=$3 - shift 2 -fi - -#inet or inet6 -FAMILY_FLAG="-4" -if [ "$2" = "-a" ]; then - FAMILY_FLAG="-$3" - shift 2 -fi - -GUESTNAME=$2 -IPADDR=$3 -MACADDR=$4 - -case "$MACADDR" in - *@*) - VLAN="${MACADDR#*@}" - VLAN="${VLAN%%@*}" - MACADDR="${MACADDR%%@*}" - ;; - *) - VLAN= - ;; -esac - -# did they ask to generate a custom MACADDR? -# generate the unique string -case "$MACADDR" in - U:*) - macunique="${MACADDR#*:}" - # now generate a 48-bit hash string from $macunique - MACADDR=$(echo $macunique|md5sum|sed 's/^$..$$..$$..$$..$$..$.*$/02:\1:\2:\3:\4:\5/') - ;; -esac - - -[ "$IPADDR" ] || [ "$WAIT" ] || { - echo "Syntax:" - echo "pipework <hostinterface> [-i containerinterface] [-l localinterfacename] [-a addressfamily] <guest> <ipaddr>/<subnet>[@default_gateway] [macaddr][@vlan]" - echo "pipework <hostinterface> [-i containerinterface] [-l localinterfacename] <guest> dhcp [macaddr][@vlan]" - echo "pipework mac:<hostinterface_macaddress> [-i containerinterface] [-l localinterfacename] [-a addressfamily] <guest> <ipaddr>/<subnet>[@default_gateway] [macaddr][@vlan]" - echo "pipework mac:<hostinterface_macaddress> [-i containerinterface] [-l localinterfacename] <guest> dhcp [macaddr][@vlan]" - echo "pipework route <guest> <route_command>" - echo "pipework rule <guest> <rule_command>" - echo "pipework tc <guest> <tc_command>" - echo "pipework --wait [-i containerinterface]" - exit 1 -} - -# Succeed if the given utility is installed. Fail otherwise. -# For explanations about `which` vs `type` vs `command`, see: -# http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-… -# (Thanks to @chenhanxiao for pointing this out!) -installed () { - command -v "$1" >/dev/null 2>&1 -} - -# Google Styleguide says error messages should go to standard error. -warn () { - echo "$@" >&2 -} -die () { - status="$1" - shift - warn "$@" - exit "$status" -} - -if echo $IFNAME | grep -q '^mac:'; then - mac_address=$(echo $IFNAME | cut -c5-) - ifmatch= - for iftest in /sys/class/net/*; do - if [ -f $iftest/address ] && [ "$mac_address" = "$(cat $iftest/address)" ]; then - ifmatch="$(basename $iftest)" - break - fi - done - - if [ -z "$ifmatch" ]; then - die 1 "Mac address $mac_address specified for interface but no host interface matched." - else - IFNAME=$ifmatch - fi -fi - -# First step: determine type of first argument (bridge, physical interface...), -# Unless "--wait" is set (then skip the whole section) -if [ -z "$WAIT" ]; then - if [ -d "/sys/class/net/$IFNAME" ] - then - if [ -d "/sys/class/net/$IFNAME/bridge" ]; then - IFTYPE=bridge - BRTYPE=linux - elif installed ovs-vsctl && ovs-vsctl list-br|grep -q "^${IFNAME}$"; then - IFTYPE=bridge - BRTYPE=openvswitch - elif [ "$(cat "/sys/class/net/$IFNAME/type")" -eq 32 ]; then # InfiniBand IPoIB interface type 32 - IFTYPE=ipoib - # The IPoIB kernel module is fussy, set device name to ib0 if not overridden - CONTAINER_IFNAME=${CONTAINER_IFNAME:-ib0} - PKEY=$VLAN - else IFTYPE=phys - fi - else - case "$IFNAME" in - br*) - IFTYPE=bridge - BRTYPE=linux - ;; - ovs*) - if ! installed ovs-vsctl; then - die 1 "Need OVS installed on the system to create an ovs bridge" - fi - IFTYPE=bridge - BRTYPE=openvswitch - ;; - route*) - IFTYPE=route - ;; - rule*) - IFTYPE=rule - ;; - tc*) - IFTYPE=tc - ;; - dummy*) - IFTYPE=dummy - ;; - *) die 1 "I do not know how to setup interface $IFNAME." ;; - esac - fi -fi - -# Set the default container interface name to eth1 if not already set -CONTAINER_IFNAME=${CONTAINER_IFNAME:-eth1} - -[ "$WAIT" ] && { - while true; do - # This first method works even without `ip` or `ifconfig` installed, - # but doesn't work on older kernels (e.g. CentOS 6.X). See #128. - grep -q '^1$' "/sys/class/net/$CONTAINER_IFNAME/carrier" && break - # This method hopefully works on those older kernels. - ip link ls dev "$CONTAINER_IFNAME" && break - sleep 1 - done > /dev/null 2>&1 - exit 0 -} - -[ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && { - die 1 "VLAN configuration currently unsupported for Linux bridge." -} - -[ "$IFTYPE" = ipoib ] && [ "$MACADDR" ] && { - die 1 "MACADDR configuration unsupported for IPoIB interfaces." -} - -# Second step: find the guest (for now, we only support LXC containers) -while read _ mnt fstype options _; do - [ "$fstype" != "cgroup" ] && continue - echo "$options" | grep -qw devices || continue - CGROUPMNT=$mnt -done < /proc/mounts - -[ "$CGROUPMNT" ] || { - die 1 "Could not locate cgroup mount point." -} - -# Try to find a cgroup matching exactly the provided name. -M=$(find "$CGROUPMNT" -name "$GUESTNAME") -N=$(echo "$M" | wc -l) -if [ -z "$M" ] ; then - N=0 -fi -case "$N" in - 0) - # If we didn't find anything, try to lookup the container with Docker. - if installed docker; then - RETRIES=3 - while [ "$RETRIES" -gt 0 ]; do - DOCKERPID=$(docker inspect --format='{{ .State.Pid }}' "$GUESTNAME") - DOCKERCID=$(docker inspect --format='{{ .ID }}' "$GUESTNAME") - DOCKERCNAME=$(docker inspect --format='{{ .Name }}' "$GUESTNAME") - - [ "$DOCKERPID" != 0 ] && break - sleep 1 - RETRIES=$((RETRIES - 1)) - done - - [ "$DOCKERPID" = 0 ] && { - die 1 "Docker inspect returned invalid PID 0" - } - - [ "$DOCKERPID" = "<no value>" ] && { - die 1 "Container $GUESTNAME not found, and unknown to Docker." - } - else - die 1 "Container $GUESTNAME not found, and Docker not installed." - fi - ;; - 1) true ;; - 2) # LXC >=3.1.0 returns two entries from the cgroups mount instead of one. - echo "$M" | grep -q "lxc\.monitor" || die 1 "Found more than one container matching $GUESTNAME." - ;; - *) die 1 "Found more than one container matching $GUESTNAME." ;; -esac - -# only check IPADDR if we are not in a route mode -[ "$IFTYPE" != route ] && [ "$IFTYPE" != rule ] && [ "$IFTYPE" != tc ] && { - case "$IPADDR" in - # Let's check first if the user asked for DHCP allocation. - dhcp|dhcp:*) - # Use Docker-specific strategy to run the DHCP client - # from the busybox image, in the network namespace of - # the container. - if ! [ "$DOCKERPID" ]; then - warn "You asked for a Docker-specific DHCP method." - warn "However, $GUESTNAME doesn't seem to be a Docker container." - warn "Try to replace 'dhcp' with another option?" - die 1 "Aborting." - fi - DHCP_CLIENT=${IPADDR%%:*} - ;; - udhcpc|udhcpc:*|udhcpc-f|udhcpc-f:*|dhcpcd|dhcpcd:*|dhclient|dhclient:*|dhclient-f|dhclient-f:*) - DHCP_CLIENT=${IPADDR%%:*} - # did they ask for the client to remain? - DHCP_FOREGROUND= - [ "${DHCP_CLIENT%-f}" != "${DHCP_CLIENT}" ] && { - DHCP_FOREGROUND=true - } - DHCP_CLIENT=${DHCP_CLIENT%-f} - if ! installed "$DHCP_CLIENT"; then - die 1 "You asked for DHCP client $DHCP_CLIENT, but I can't find it." - fi - ;; - # Alright, no DHCP? Then let's see if we have a subnet *and* gateway. - */*@*) - GATEWAY="${IPADDR#*@}" GATEWAY="${GATEWAY%%@*}" - IPADDR="${IPADDR%%@*}" - ;; - # No gateway? We need at least a subnet, anyway! - */*) : ;; - # ... No? Then stop right here. - *) - warn "The IP address should include a netmask." - die 1 "Maybe you meant $IPADDR/24 ?" - ;; - esac -} - -# If a DHCP method was specified, extract the DHCP options. -if [ "$DHCP_CLIENT" ]; then - case "$IPADDR" in - *:*) DHCP_OPTIONS="${IPADDR#*:}" ;; - esac -fi - -if [ "$DOCKERPID" ]; then - NSPID=$DOCKERPID -else - NSPID=$(head -n 1 "$(find "$CGROUPMNT" -name "$GUESTNAME" | head -n 1)/tasks") - [ "$NSPID" ] || { - # it is an alternative way to get the pid - NSPID=$(lxc-info -n "$GUESTNAME" | grep PID | grep -Eo '[0-9]+') - [ "$NSPID" ] || { - die 1 "Could not find a process inside container $GUESTNAME." - } - } -fi - -# Check if an incompatible VLAN device already exists -[ "$IFTYPE" = phys ] && [ "$VLAN" ] && [ -d "/sys/class/net/$IFNAME.VLAN" ] && { - ip -d link show "$IFNAME.$VLAN" | grep -q "vlan.*id $VLAN" || { - die 1 "$IFNAME.VLAN already exists but is not a VLAN device for tag $VLAN" - } -} - -[ ! -d /var/run/netns ] && mkdir -p /var/run/netns -rm -f "/var/run/netns/$NSPID" -ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID" - -# Check if we need to create a bridge. -[ "$IFTYPE" = bridge ] && [ ! -d "/sys/class/net/$IFNAME" ] && { - [ "$BRTYPE" = linux ] && { - (ip link add dev "$IFNAME" type bridge > /dev/null 2>&1) || (brctl addbr "$IFNAME") - ip link set "$IFNAME" up - } - [ "$BRTYPE" = openvswitch ] && { - ovs-vsctl add-br "$IFNAME" - } -} - -[ "$IFTYPE" != "route" ] && [ "$IFTYPE" != "dummy" ] && [ "$IFTYPE" != "rule" ] && [ "$IFTYPE" != "tc" ] && MTU=$(ip link show "$IFNAME" | awk '{print $5}') - -# If it's a bridge, we need to create a veth pair -[ "$IFTYPE" = bridge ] && { - if [ -z "$LOCAL_IFNAME" ]; then - LOCAL_IFNAME="v${CONTAINER_IFNAME}pl${NSPID}" - fi - GUEST_IFNAME="v${CONTAINER_IFNAME}pg${NSPID}" - # Does the link already exist? - if ip link show "$LOCAL_IFNAME" >/dev/null 2>&1; then - # link exists, is it in use? - if ip link show "$LOCAL_IFNAME" up | grep -q "UP"; then - echo "Link $LOCAL_IFNAME exists and is up" - exit 1 - fi - # delete the link so we can re-add it afterwards - ip link del "$LOCAL_IFNAME" - fi - ip link add name "$LOCAL_IFNAME" mtu "$MTU" type veth peer name "$GUEST_IFNAME" mtu "$MTU" - case "$BRTYPE" in - linux) - (ip link set "$LOCAL_IFNAME" master "$IFNAME" > /dev/null 2>&1) || (brctl addif "$IFNAME" "$LOCAL_IFNAME") - ;; - openvswitch) - if ! ovs-vsctl list-ports "$IFNAME" | grep -q "^${LOCAL_IFNAME}$"; then - ovs-vsctl add-port "$IFNAME" "$LOCAL_IFNAME" ${VLAN:+tag="$VLAN"} \ - -- set Interface "$LOCAL_IFNAME" \ - external-ids:pipework.interface="$LOCAL_IFNAME" \ - external-ids:pipework.bridge="$IFNAME" \ - ${DOCKERCID:+external-ids:pipework.containerid="$DOCKERCID"} \ - ${DOCKERCNAME:+external-ids:pipework.containername="$DOCKERCNAME"} \ - ${NSPID:+external-ids:pipework.nspid="$NSPID"} \ - ${VLAN:+external-ids:pipework.vlan="$VLAN"} - fi - ;; - esac - ip link set "$LOCAL_IFNAME" up -} - -# If it's a physical interface, create a macvlan subinterface -[ "$IFTYPE" = phys ] && { - [ "$VLAN" ] && { - [ ! -d "/sys/class/net/${IFNAME}.${VLAN}" ] && { - ip link add link "$IFNAME" name "$IFNAME.$VLAN" mtu "$MTU" type vlan id "$VLAN" - } - ip link set "$IFNAME" up - IFNAME=$IFNAME.$VLAN - } - - if [ ! -z "$DIRECT_PHYS" ]; then - GUEST_IFNAME=$IFNAME - else - GUEST_IFNAME=ph$NSPID$CONTAINER_IFNAME - ip link add link "$IFNAME" dev "$GUEST_IFNAME" mtu "$MTU" type macvlan mode bridge - fi - - ip link set "$IFNAME" up -} - -# If it's an IPoIB interface, create a virtual IPoIB interface (the IPoIB -# equivalent of a macvlan device) -# -# Note: no macvlan subinterface nor Ethernet bridge can be created on top of an -# IPoIB interface. InfiniBand is not Ethernet. IPoIB is an IP layer on top of -# InfiniBand, without an intermediate Ethernet layer. -[ "$IFTYPE" = ipoib ] && { - GUEST_IFNAME="${IFNAME}.${NSPID}" - - # If a partition key is provided, use it - [ "$PKEY" ] && { - GUEST_IFNAME="${IFNAME}.${PKEY}.${NSPID}" - PKEY="pkey 0x$PKEY" - } - - ip link add link "$IFNAME" name "$GUEST_IFNAME" type ipoib $PKEY - ip link set "$IFNAME" up -} - -# If its a dummy interface, create a dummy interface. -[ "$IFTYPE" = dummy ] && { - GUEST_IFNAME=du$NSPID$CONTAINER_IFNAME - ip link add dev "$GUEST_IFNAME" type dummy -} - -# If the `route` command was specified ... -if [ "$IFTYPE" = route ]; then - # ... discard the first two arguments and pass the rest to the route command. - shift 2 - ip netns exec "$NSPID" ip route "$@" -elif [ "$IFTYPE" = rule ] ; then - shift 2 - ip netns exec "$NSPID" ip rule "$@" -elif [ "$IFTYPE" = tc ] ; then - shift 2 - ip netns exec "$NSPID" tc "$@" -else - # Otherwise, run normally. - ip link set "$GUEST_IFNAME" netns "$NSPID" - ip netns exec "$NSPID" ip link set "$GUEST_IFNAME" name "$CONTAINER_IFNAME" - [ "$MACADDR" ] && ip netns exec "$NSPID" ip link set dev "$CONTAINER_IFNAME" address "$MACADDR" - - # When using any of the DHCP methods, we start a DHCP client in the - # network namespace of the container. With the 'dhcp' method, the - # client used is taken from the Docker busybox image (therefore - # requiring no specific client installed on the host). Other methods - # use a locally installed client. - case "$DHCP_CLIENT" in - dhcp) - docker run -d --net container:$GUESTNAME --cap-add NET_ADMIN \ - busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \ - $DHCP_OPTIONS \ - >/dev/null - ;; - udhcpc) - DHCP_Q="-q" - [ "$DHCP_FOREGROUND" ] && { - DHCP_OPTIONS="$DHCP_OPTIONS -f" - } - ip netns exec "$NSPID" "$DHCP_CLIENT" -qi "$CONTAINER_IFNAME" \ - -x "hostname:$GUESTNAME" \ - -p "/var/run/udhcpc.$GUESTNAME.pid" \ - $DHCP_OPTIONS - [ ! "$DHCP_FOREGROUND" ] && { - rm "/var/run/udhcpc.$GUESTNAME.pid" - } - ;; - dhclient) - ip netns exec "$NSPID" "$DHCP_CLIENT" "$CONTAINER_IFNAME" \ - -pf "/var/run/dhclient.$GUESTNAME.pid" \ - -lf "/etc/dhclient/dhclient.$GUESTNAME.leases" \ - $DHCP_OPTIONS - # kill dhclient after get ip address to prevent device be used after container close - [ ! "$DHCP_FOREGROUND" ] && { - kill "$(cat "/var/run/dhclient.$GUESTNAME.pid")" - rm "/var/run/dhclient.$GUESTNAME.pid" - } - ;; - dhcpcd) - ip netns exec "$NSPID" "$DHCP_CLIENT" -q "$CONTAINER_IFNAME" -h "$GUESTNAME" - ;; - "") - if installed ipcalc; then - eval $(ipcalc -b $IPADDR) - ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" brd "$BROADCAST" dev "$CONTAINER_IFNAME" - else - ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" dev "$CONTAINER_IFNAME" - fi - - [ "$GATEWAY" ] && { - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route delete default >/dev/null 2>&1 && true - } - ip netns exec "$NSPID" ip "$FAMILY_FLAG" link set "$CONTAINER_IFNAME" up - [ "$GATEWAY" ] && { - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route get "$GATEWAY" >/dev/null 2>&1 || \ - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route add "$GATEWAY/32" dev "$CONTAINER_IFNAME" - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route replace default via "$GATEWAY" dev "$CONTAINER_IFNAME" - } - ;; - esac - - # Give our ARP neighbors a nudge about the new interface - if installed arping; then - IPADDR=$(echo "$IPADDR" | cut -d/ -f1) - ip netns exec "$NSPID" arping -c 1 -A -I "$CONTAINER_IFNAME" "$IPADDR" > /dev/null 2>&1 || true - else - echo "Warning: arping not found; interface may not be immediately reachable" - fi -fi -# Remove NSPID to avoid `ip netns` catch it. -rm -f "/var/run/netns/$NSPID" - -# vim: set tabstop=2 shiftwidth=2 softtabstop=2 expandtab : diff --git a/osmo-gbproxy-master/Dockerfile b/osmo-gbproxy-master/Dockerfile index 61463c5..3e0e40c 100644 --- a/osmo-gbproxy-master/Dockerfile +++ b/osmo-gbproxy-master/Dockerfile @@ -48,7 +48,7 @@ # work-around for stupid docker not being able to properly deal with host netdevices or start # containers in pre-existing netns -COPY pipework /usr/bin/pipework +COPY .common/pipework /usr/bin/pipework COPY docker-entrypoint.sh /docker-entrypoint.sh WORKDIR /data diff --git a/osmo-gbproxy-master/pipework b/osmo-gbproxy-master/pipework deleted file mode 100755 index 97ce66b..0000000 --- a/osmo-gbproxy-master/pipework +++ /dev/null @@ -1,489 +0,0 @@ -#!/bin/sh -# This code should (try to) follow Google's Shell Style Guide -# (https://google.github.io/styleguide/shell.xml) -set -e - -case "$1" in - --wait) - WAIT=1 - ;; - --direct-phys) - DIRECT_PHYS=1 - shift - ;; -esac - -IFNAME=$1 - -# default value set further down if not set here -CONTAINER_IFNAME= -if [ "$2" = "-i" ]; then - CONTAINER_IFNAME=$3 - shift 2 -fi - -if [ "$2" = "-l" ]; then - LOCAL_IFNAME=$3 - shift 2 -fi - -#inet or inet6 -FAMILY_FLAG="-4" -if [ "$2" = "-a" ]; then - FAMILY_FLAG="-$3" - shift 2 -fi - -GUESTNAME=$2 -IPADDR=$3 -MACADDR=$4 - -case "$MACADDR" in - *@*) - VLAN="${MACADDR#*@}" - VLAN="${VLAN%%@*}" - MACADDR="${MACADDR%%@*}" - ;; - *) - VLAN= - ;; -esac - -# did they ask to generate a custom MACADDR? -# generate the unique string -case "$MACADDR" in - U:*) - macunique="${MACADDR#*:}" - # now generate a 48-bit hash string from $macunique - MACADDR=$(echo $macunique|md5sum|sed 's/^$..$$..$$..$$..$$..$.*$/02:\1:\2:\3:\4:\5/') - ;; -esac - - -[ "$IPADDR" ] || [ "$WAIT" ] || { - echo "Syntax:" - echo "pipework <hostinterface> [-i containerinterface] [-l localinterfacename] [-a addressfamily] <guest> <ipaddr>/<subnet>[@default_gateway] [macaddr][@vlan]" - echo "pipework <hostinterface> [-i containerinterface] [-l localinterfacename] <guest> dhcp [macaddr][@vlan]" - echo "pipework mac:<hostinterface_macaddress> [-i containerinterface] [-l localinterfacename] [-a addressfamily] <guest> <ipaddr>/<subnet>[@default_gateway] [macaddr][@vlan]" - echo "pipework mac:<hostinterface_macaddress> [-i containerinterface] [-l localinterfacename] <guest> dhcp [macaddr][@vlan]" - echo "pipework route <guest> <route_command>" - echo "pipework rule <guest> <rule_command>" - echo "pipework tc <guest> <tc_command>" - echo "pipework --wait [-i containerinterface]" - exit 1 -} - -# Succeed if the given utility is installed. Fail otherwise. -# For explanations about `which` vs `type` vs `command`, see: -# http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-… -# (Thanks to @chenhanxiao for pointing this out!) -installed () { - command -v "$1" >/dev/null 2>&1 -} - -# Google Styleguide says error messages should go to standard error. -warn () { - echo "$@" >&2 -} -die () { - status="$1" - shift - warn "$@" - exit "$status" -} - -if echo $IFNAME | grep -q '^mac:'; then - mac_address=$(echo $IFNAME | cut -c5-) - ifmatch= - for iftest in /sys/class/net/*; do - if [ -f $iftest/address ] && [ "$mac_address" = "$(cat $iftest/address)" ]; then - ifmatch="$(basename $iftest)" - break - fi - done - - if [ -z "$ifmatch" ]; then - die 1 "Mac address $mac_address specified for interface but no host interface matched." - else - IFNAME=$ifmatch - fi -fi - -# First step: determine type of first argument (bridge, physical interface...), -# Unless "--wait" is set (then skip the whole section) -if [ -z "$WAIT" ]; then - if [ -d "/sys/class/net/$IFNAME" ] - then - if [ -d "/sys/class/net/$IFNAME/bridge" ]; then - IFTYPE=bridge - BRTYPE=linux - elif installed ovs-vsctl && ovs-vsctl list-br|grep -q "^${IFNAME}$"; then - IFTYPE=bridge - BRTYPE=openvswitch - elif [ "$(cat "/sys/class/net/$IFNAME/type")" -eq 32 ]; then # InfiniBand IPoIB interface type 32 - IFTYPE=ipoib - # The IPoIB kernel module is fussy, set device name to ib0 if not overridden - CONTAINER_IFNAME=${CONTAINER_IFNAME:-ib0} - PKEY=$VLAN - else IFTYPE=phys - fi - else - case "$IFNAME" in - br*) - IFTYPE=bridge - BRTYPE=linux - ;; - ovs*) - if ! installed ovs-vsctl; then - die 1 "Need OVS installed on the system to create an ovs bridge" - fi - IFTYPE=bridge - BRTYPE=openvswitch - ;; - route*) - IFTYPE=route - ;; - rule*) - IFTYPE=rule - ;; - tc*) - IFTYPE=tc - ;; - dummy*) - IFTYPE=dummy - ;; - *) die 1 "I do not know how to setup interface $IFNAME." ;; - esac - fi -fi - -# Set the default container interface name to eth1 if not already set -CONTAINER_IFNAME=${CONTAINER_IFNAME:-eth1} - -[ "$WAIT" ] && { - while true; do - # This first method works even without `ip` or `ifconfig` installed, - # but doesn't work on older kernels (e.g. CentOS 6.X). See #128. - grep -q '^1$' "/sys/class/net/$CONTAINER_IFNAME/carrier" && break - # This method hopefully works on those older kernels. - ip link ls dev "$CONTAINER_IFNAME" && break - sleep 1 - done > /dev/null 2>&1 - exit 0 -} - -[ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && { - die 1 "VLAN configuration currently unsupported for Linux bridge." -} - -[ "$IFTYPE" = ipoib ] && [ "$MACADDR" ] && { - die 1 "MACADDR configuration unsupported for IPoIB interfaces." -} - -# Second step: find the guest (for now, we only support LXC containers) -while read _ mnt fstype options _; do - [ "$fstype" != "cgroup" ] && continue - echo "$options" | grep -qw devices || continue - CGROUPMNT=$mnt -done < /proc/mounts - -[ "$CGROUPMNT" ] || { - die 1 "Could not locate cgroup mount point." -} - -# Try to find a cgroup matching exactly the provided name. -M=$(find "$CGROUPMNT" -name "$GUESTNAME") -N=$(echo "$M" | wc -l) -if [ -z "$M" ] ; then - N=0 -fi -case "$N" in - 0) - # If we didn't find anything, try to lookup the container with Docker. - if installed docker; then - RETRIES=3 - while [ "$RETRIES" -gt 0 ]; do - DOCKERPID=$(docker inspect --format='{{ .State.Pid }}' "$GUESTNAME") - DOCKERCID=$(docker inspect --format='{{ .ID }}' "$GUESTNAME") - DOCKERCNAME=$(docker inspect --format='{{ .Name }}' "$GUESTNAME") - - [ "$DOCKERPID" != 0 ] && break - sleep 1 - RETRIES=$((RETRIES - 1)) - done - - [ "$DOCKERPID" = 0 ] && { - die 1 "Docker inspect returned invalid PID 0" - } - - [ "$DOCKERPID" = "<no value>" ] && { - die 1 "Container $GUESTNAME not found, and unknown to Docker." - } - else - die 1 "Container $GUESTNAME not found, and Docker not installed." - fi - ;; - 1) true ;; - 2) # LXC >=3.1.0 returns two entries from the cgroups mount instead of one. - echo "$M" | grep -q "lxc\.monitor" || die 1 "Found more than one container matching $GUESTNAME." - ;; - *) die 1 "Found more than one container matching $GUESTNAME." ;; -esac - -# only check IPADDR if we are not in a route mode -[ "$IFTYPE" != route ] && [ "$IFTYPE" != rule ] && [ "$IFTYPE" != tc ] && { - case "$IPADDR" in - # Let's check first if the user asked for DHCP allocation. - dhcp|dhcp:*) - # Use Docker-specific strategy to run the DHCP client - # from the busybox image, in the network namespace of - # the container. - if ! [ "$DOCKERPID" ]; then - warn "You asked for a Docker-specific DHCP method." - warn "However, $GUESTNAME doesn't seem to be a Docker container." - warn "Try to replace 'dhcp' with another option?" - die 1 "Aborting." - fi - DHCP_CLIENT=${IPADDR%%:*} - ;; - udhcpc|udhcpc:*|udhcpc-f|udhcpc-f:*|dhcpcd|dhcpcd:*|dhclient|dhclient:*|dhclient-f|dhclient-f:*) - DHCP_CLIENT=${IPADDR%%:*} - # did they ask for the client to remain? - DHCP_FOREGROUND= - [ "${DHCP_CLIENT%-f}" != "${DHCP_CLIENT}" ] && { - DHCP_FOREGROUND=true - } - DHCP_CLIENT=${DHCP_CLIENT%-f} - if ! installed "$DHCP_CLIENT"; then - die 1 "You asked for DHCP client $DHCP_CLIENT, but I can't find it." - fi - ;; - # Alright, no DHCP? Then let's see if we have a subnet *and* gateway. - */*@*) - GATEWAY="${IPADDR#*@}" GATEWAY="${GATEWAY%%@*}" - IPADDR="${IPADDR%%@*}" - ;; - # No gateway? We need at least a subnet, anyway! - */*) : ;; - # ... No? Then stop right here. - *) - warn "The IP address should include a netmask." - die 1 "Maybe you meant $IPADDR/24 ?" - ;; - esac -} - -# If a DHCP method was specified, extract the DHCP options. -if [ "$DHCP_CLIENT" ]; then - case "$IPADDR" in - *:*) DHCP_OPTIONS="${IPADDR#*:}" ;; - esac -fi - -if [ "$DOCKERPID" ]; then - NSPID=$DOCKERPID -else - NSPID=$(head -n 1 "$(find "$CGROUPMNT" -name "$GUESTNAME" | head -n 1)/tasks") - [ "$NSPID" ] || { - # it is an alternative way to get the pid - NSPID=$(lxc-info -n "$GUESTNAME" | grep PID | grep -Eo '[0-9]+') - [ "$NSPID" ] || { - die 1 "Could not find a process inside container $GUESTNAME." - } - } -fi - -# Check if an incompatible VLAN device already exists -[ "$IFTYPE" = phys ] && [ "$VLAN" ] && [ -d "/sys/class/net/$IFNAME.VLAN" ] && { - ip -d link show "$IFNAME.$VLAN" | grep -q "vlan.*id $VLAN" || { - die 1 "$IFNAME.VLAN already exists but is not a VLAN device for tag $VLAN" - } -} - -[ ! -d /var/run/netns ] && mkdir -p /var/run/netns -rm -f "/var/run/netns/$NSPID" -ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID" - -# Check if we need to create a bridge. -[ "$IFTYPE" = bridge ] && [ ! -d "/sys/class/net/$IFNAME" ] && { - [ "$BRTYPE" = linux ] && { - (ip link add dev "$IFNAME" type bridge > /dev/null 2>&1) || (brctl addbr "$IFNAME") - ip link set "$IFNAME" up - } - [ "$BRTYPE" = openvswitch ] && { - ovs-vsctl add-br "$IFNAME" - } -} - -[ "$IFTYPE" != "route" ] && [ "$IFTYPE" != "dummy" ] && [ "$IFTYPE" != "rule" ] && [ "$IFTYPE" != "tc" ] && MTU=$(ip link show "$IFNAME" | awk '{print $5}') - -# If it's a bridge, we need to create a veth pair -[ "$IFTYPE" = bridge ] && { - if [ -z "$LOCAL_IFNAME" ]; then - LOCAL_IFNAME="v${CONTAINER_IFNAME}pl${NSPID}" - fi - GUEST_IFNAME="v${CONTAINER_IFNAME}pg${NSPID}" - # Does the link already exist? - if ip link show "$LOCAL_IFNAME" >/dev/null 2>&1; then - # link exists, is it in use? - if ip link show "$LOCAL_IFNAME" up | grep -q "UP"; then - echo "Link $LOCAL_IFNAME exists and is up" - exit 1 - fi - # delete the link so we can re-add it afterwards - ip link del "$LOCAL_IFNAME" - fi - ip link add name "$LOCAL_IFNAME" mtu "$MTU" type veth peer name "$GUEST_IFNAME" mtu "$MTU" - case "$BRTYPE" in - linux) - (ip link set "$LOCAL_IFNAME" master "$IFNAME" > /dev/null 2>&1) || (brctl addif "$IFNAME" "$LOCAL_IFNAME") - ;; - openvswitch) - if ! ovs-vsctl list-ports "$IFNAME" | grep -q "^${LOCAL_IFNAME}$"; then - ovs-vsctl add-port "$IFNAME" "$LOCAL_IFNAME" ${VLAN:+tag="$VLAN"} \ - -- set Interface "$LOCAL_IFNAME" \ - external-ids:pipework.interface="$LOCAL_IFNAME" \ - external-ids:pipework.bridge="$IFNAME" \ - ${DOCKERCID:+external-ids:pipework.containerid="$DOCKERCID"} \ - ${DOCKERCNAME:+external-ids:pipework.containername="$DOCKERCNAME"} \ - ${NSPID:+external-ids:pipework.nspid="$NSPID"} \ - ${VLAN:+external-ids:pipework.vlan="$VLAN"} - fi - ;; - esac - ip link set "$LOCAL_IFNAME" up -} - -# If it's a physical interface, create a macvlan subinterface -[ "$IFTYPE" = phys ] && { - [ "$VLAN" ] && { - [ ! -d "/sys/class/net/${IFNAME}.${VLAN}" ] && { - ip link add link "$IFNAME" name "$IFNAME.$VLAN" mtu "$MTU" type vlan id "$VLAN" - } - ip link set "$IFNAME" up - IFNAME=$IFNAME.$VLAN - } - - if [ ! -z "$DIRECT_PHYS" ]; then - GUEST_IFNAME=$IFNAME - else - GUEST_IFNAME=ph$NSPID$CONTAINER_IFNAME - ip link add link "$IFNAME" dev "$GUEST_IFNAME" mtu "$MTU" type macvlan mode bridge - fi - - ip link set "$IFNAME" up -} - -# If it's an IPoIB interface, create a virtual IPoIB interface (the IPoIB -# equivalent of a macvlan device) -# -# Note: no macvlan subinterface nor Ethernet bridge can be created on top of an -# IPoIB interface. InfiniBand is not Ethernet. IPoIB is an IP layer on top of -# InfiniBand, without an intermediate Ethernet layer. -[ "$IFTYPE" = ipoib ] && { - GUEST_IFNAME="${IFNAME}.${NSPID}" - - # If a partition key is provided, use it - [ "$PKEY" ] && { - GUEST_IFNAME="${IFNAME}.${PKEY}.${NSPID}" - PKEY="pkey 0x$PKEY" - } - - ip link add link "$IFNAME" name "$GUEST_IFNAME" type ipoib $PKEY - ip link set "$IFNAME" up -} - -# If its a dummy interface, create a dummy interface. -[ "$IFTYPE" = dummy ] && { - GUEST_IFNAME=du$NSPID$CONTAINER_IFNAME - ip link add dev "$GUEST_IFNAME" type dummy -} - -# If the `route` command was specified ... -if [ "$IFTYPE" = route ]; then - # ... discard the first two arguments and pass the rest to the route command. - shift 2 - ip netns exec "$NSPID" ip route "$@" -elif [ "$IFTYPE" = rule ] ; then - shift 2 - ip netns exec "$NSPID" ip rule "$@" -elif [ "$IFTYPE" = tc ] ; then - shift 2 - ip netns exec "$NSPID" tc "$@" -else - # Otherwise, run normally. - ip link set "$GUEST_IFNAME" netns "$NSPID" - ip netns exec "$NSPID" ip link set "$GUEST_IFNAME" name "$CONTAINER_IFNAME" - [ "$MACADDR" ] && ip netns exec "$NSPID" ip link set dev "$CONTAINER_IFNAME" address "$MACADDR" - - # When using any of the DHCP methods, we start a DHCP client in the - # network namespace of the container. With the 'dhcp' method, the - # client used is taken from the Docker busybox image (therefore - # requiring no specific client installed on the host). Other methods - # use a locally installed client. - case "$DHCP_CLIENT" in - dhcp) - docker run -d --net container:$GUESTNAME --cap-add NET_ADMIN \ - busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \ - $DHCP_OPTIONS \ - >/dev/null - ;; - udhcpc) - DHCP_Q="-q" - [ "$DHCP_FOREGROUND" ] && { - DHCP_OPTIONS="$DHCP_OPTIONS -f" - } - ip netns exec "$NSPID" "$DHCP_CLIENT" -qi "$CONTAINER_IFNAME" \ - -x "hostname:$GUESTNAME" \ - -p "/var/run/udhcpc.$GUESTNAME.pid" \ - $DHCP_OPTIONS - [ ! "$DHCP_FOREGROUND" ] && { - rm "/var/run/udhcpc.$GUESTNAME.pid" - } - ;; - dhclient) - ip netns exec "$NSPID" "$DHCP_CLIENT" "$CONTAINER_IFNAME" \ - -pf "/var/run/dhclient.$GUESTNAME.pid" \ - -lf "/etc/dhclient/dhclient.$GUESTNAME.leases" \ - $DHCP_OPTIONS - # kill dhclient after get ip address to prevent device be used after container close - [ ! "$DHCP_FOREGROUND" ] && { - kill "$(cat "/var/run/dhclient.$GUESTNAME.pid")" - rm "/var/run/dhclient.$GUESTNAME.pid" - } - ;; - dhcpcd) - ip netns exec "$NSPID" "$DHCP_CLIENT" -q "$CONTAINER_IFNAME" -h "$GUESTNAME" - ;; - "") - if installed ipcalc; then - eval $(ipcalc -b $IPADDR) - ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" brd "$BROADCAST" dev "$CONTAINER_IFNAME" - else - ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" dev "$CONTAINER_IFNAME" - fi - - [ "$GATEWAY" ] && { - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route delete default >/dev/null 2>&1 && true - } - ip netns exec "$NSPID" ip "$FAMILY_FLAG" link set "$CONTAINER_IFNAME" up - [ "$GATEWAY" ] && { - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route get "$GATEWAY" >/dev/null 2>&1 || \ - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route add "$GATEWAY/32" dev "$CONTAINER_IFNAME" - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route replace default via "$GATEWAY" dev "$CONTAINER_IFNAME" - } - ;; - esac - - # Give our ARP neighbors a nudge about the new interface - if installed arping; then - IPADDR=$(echo "$IPADDR" | cut -d/ -f1) - ip netns exec "$NSPID" arping -c 1 -A -I "$CONTAINER_IFNAME" "$IPADDR" > /dev/null 2>&1 || true - else - echo "Warning: arping not found; interface may not be immediately reachable" - fi -fi -# Remove NSPID to avoid `ip netns` catch it. -rm -f "/var/run/netns/$NSPID" - -# vim: set tabstop=2 shiftwidth=2 softtabstop=2 expandtab : diff --git a/osmo-ns-master/Dockerfile b/osmo-ns-master/Dockerfile index 1185253..2f88c83 100644 --- a/osmo-ns-master/Dockerfile +++ b/osmo-ns-master/Dockerfile @@ -41,7 +41,7 @@ # work-around for stupid docker not being able to properly deal with host netdevices or start # containers in pre-existing netns -COPY pipework /usr/bin/pipework +COPY .common/pipework /usr/bin/pipework COPY docker-entrypoint.sh /docker-entrypoint.sh WORKDIR /data diff --git a/osmo-ns-master/pipework b/osmo-ns-master/pipework deleted file mode 100755 index 97ce66b..0000000 --- a/osmo-ns-master/pipework +++ /dev/null @@ -1,489 +0,0 @@ -#!/bin/sh -# This code should (try to) follow Google's Shell Style Guide -# (https://google.github.io/styleguide/shell.xml) -set -e - -case "$1" in - --wait) - WAIT=1 - ;; - --direct-phys) - DIRECT_PHYS=1 - shift - ;; -esac - -IFNAME=$1 - -# default value set further down if not set here -CONTAINER_IFNAME= -if [ "$2" = "-i" ]; then - CONTAINER_IFNAME=$3 - shift 2 -fi - -if [ "$2" = "-l" ]; then - LOCAL_IFNAME=$3 - shift 2 -fi - -#inet or inet6 -FAMILY_FLAG="-4" -if [ "$2" = "-a" ]; then - FAMILY_FLAG="-$3" - shift 2 -fi - -GUESTNAME=$2 -IPADDR=$3 -MACADDR=$4 - -case "$MACADDR" in - *@*) - VLAN="${MACADDR#*@}" - VLAN="${VLAN%%@*}" - MACADDR="${MACADDR%%@*}" - ;; - *) - VLAN= - ;; -esac - -# did they ask to generate a custom MACADDR? -# generate the unique string -case "$MACADDR" in - U:*) - macunique="${MACADDR#*:}" - # now generate a 48-bit hash string from $macunique - MACADDR=$(echo $macunique|md5sum|sed 's/^$..$$..$$..$$..$$..$.*$/02:\1:\2:\3:\4:\5/') - ;; -esac - - -[ "$IPADDR" ] || [ "$WAIT" ] || { - echo "Syntax:" - echo "pipework <hostinterface> [-i containerinterface] [-l localinterfacename] [-a addressfamily] <guest> <ipaddr>/<subnet>[@default_gateway] [macaddr][@vlan]" - echo "pipework <hostinterface> [-i containerinterface] [-l localinterfacename] <guest> dhcp [macaddr][@vlan]" - echo "pipework mac:<hostinterface_macaddress> [-i containerinterface] [-l localinterfacename] [-a addressfamily] <guest> <ipaddr>/<subnet>[@default_gateway] [macaddr][@vlan]" - echo "pipework mac:<hostinterface_macaddress> [-i containerinterface] [-l localinterfacename] <guest> dhcp [macaddr][@vlan]" - echo "pipework route <guest> <route_command>" - echo "pipework rule <guest> <rule_command>" - echo "pipework tc <guest> <tc_command>" - echo "pipework --wait [-i containerinterface]" - exit 1 -} - -# Succeed if the given utility is installed. Fail otherwise. -# For explanations about `which` vs `type` vs `command`, see: -# http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-… -# (Thanks to @chenhanxiao for pointing this out!) -installed () { - command -v "$1" >/dev/null 2>&1 -} - -# Google Styleguide says error messages should go to standard error. -warn () { - echo "$@" >&2 -} -die () { - status="$1" - shift - warn "$@" - exit "$status" -} - -if echo $IFNAME | grep -q '^mac:'; then - mac_address=$(echo $IFNAME | cut -c5-) - ifmatch= - for iftest in /sys/class/net/*; do - if [ -f $iftest/address ] && [ "$mac_address" = "$(cat $iftest/address)" ]; then - ifmatch="$(basename $iftest)" - break - fi - done - - if [ -z "$ifmatch" ]; then - die 1 "Mac address $mac_address specified for interface but no host interface matched." - else - IFNAME=$ifmatch - fi -fi - -# First step: determine type of first argument (bridge, physical interface...), -# Unless "--wait" is set (then skip the whole section) -if [ -z "$WAIT" ]; then - if [ -d "/sys/class/net/$IFNAME" ] - then - if [ -d "/sys/class/net/$IFNAME/bridge" ]; then - IFTYPE=bridge - BRTYPE=linux - elif installed ovs-vsctl && ovs-vsctl list-br|grep -q "^${IFNAME}$"; then - IFTYPE=bridge - BRTYPE=openvswitch - elif [ "$(cat "/sys/class/net/$IFNAME/type")" -eq 32 ]; then # InfiniBand IPoIB interface type 32 - IFTYPE=ipoib - # The IPoIB kernel module is fussy, set device name to ib0 if not overridden - CONTAINER_IFNAME=${CONTAINER_IFNAME:-ib0} - PKEY=$VLAN - else IFTYPE=phys - fi - else - case "$IFNAME" in - br*) - IFTYPE=bridge - BRTYPE=linux - ;; - ovs*) - if ! installed ovs-vsctl; then - die 1 "Need OVS installed on the system to create an ovs bridge" - fi - IFTYPE=bridge - BRTYPE=openvswitch - ;; - route*) - IFTYPE=route - ;; - rule*) - IFTYPE=rule - ;; - tc*) - IFTYPE=tc - ;; - dummy*) - IFTYPE=dummy - ;; - *) die 1 "I do not know how to setup interface $IFNAME." ;; - esac - fi -fi - -# Set the default container interface name to eth1 if not already set -CONTAINER_IFNAME=${CONTAINER_IFNAME:-eth1} - -[ "$WAIT" ] && { - while true; do - # This first method works even without `ip` or `ifconfig` installed, - # but doesn't work on older kernels (e.g. CentOS 6.X). See #128. - grep -q '^1$' "/sys/class/net/$CONTAINER_IFNAME/carrier" && break - # This method hopefully works on those older kernels. - ip link ls dev "$CONTAINER_IFNAME" && break - sleep 1 - done > /dev/null 2>&1 - exit 0 -} - -[ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && { - die 1 "VLAN configuration currently unsupported for Linux bridge." -} - -[ "$IFTYPE" = ipoib ] && [ "$MACADDR" ] && { - die 1 "MACADDR configuration unsupported for IPoIB interfaces." -} - -# Second step: find the guest (for now, we only support LXC containers) -while read _ mnt fstype options _; do - [ "$fstype" != "cgroup" ] && continue - echo "$options" | grep -qw devices || continue - CGROUPMNT=$mnt -done < /proc/mounts - -[ "$CGROUPMNT" ] || { - die 1 "Could not locate cgroup mount point." -} - -# Try to find a cgroup matching exactly the provided name. -M=$(find "$CGROUPMNT" -name "$GUESTNAME") -N=$(echo "$M" | wc -l) -if [ -z "$M" ] ; then - N=0 -fi -case "$N" in - 0) - # If we didn't find anything, try to lookup the container with Docker. - if installed docker; then - RETRIES=3 - while [ "$RETRIES" -gt 0 ]; do - DOCKERPID=$(docker inspect --format='{{ .State.Pid }}' "$GUESTNAME") - DOCKERCID=$(docker inspect --format='{{ .ID }}' "$GUESTNAME") - DOCKERCNAME=$(docker inspect --format='{{ .Name }}' "$GUESTNAME") - - [ "$DOCKERPID" != 0 ] && break - sleep 1 - RETRIES=$((RETRIES - 1)) - done - - [ "$DOCKERPID" = 0 ] && { - die 1 "Docker inspect returned invalid PID 0" - } - - [ "$DOCKERPID" = "<no value>" ] && { - die 1 "Container $GUESTNAME not found, and unknown to Docker." - } - else - die 1 "Container $GUESTNAME not found, and Docker not installed." - fi - ;; - 1) true ;; - 2) # LXC >=3.1.0 returns two entries from the cgroups mount instead of one. - echo "$M" | grep -q "lxc\.monitor" || die 1 "Found more than one container matching $GUESTNAME." - ;; - *) die 1 "Found more than one container matching $GUESTNAME." ;; -esac - -# only check IPADDR if we are not in a route mode -[ "$IFTYPE" != route ] && [ "$IFTYPE" != rule ] && [ "$IFTYPE" != tc ] && { - case "$IPADDR" in - # Let's check first if the user asked for DHCP allocation. - dhcp|dhcp:*) - # Use Docker-specific strategy to run the DHCP client - # from the busybox image, in the network namespace of - # the container. - if ! [ "$DOCKERPID" ]; then - warn "You asked for a Docker-specific DHCP method." - warn "However, $GUESTNAME doesn't seem to be a Docker container." - warn "Try to replace 'dhcp' with another option?" - die 1 "Aborting." - fi - DHCP_CLIENT=${IPADDR%%:*} - ;; - udhcpc|udhcpc:*|udhcpc-f|udhcpc-f:*|dhcpcd|dhcpcd:*|dhclient|dhclient:*|dhclient-f|dhclient-f:*) - DHCP_CLIENT=${IPADDR%%:*} - # did they ask for the client to remain? - DHCP_FOREGROUND= - [ "${DHCP_CLIENT%-f}" != "${DHCP_CLIENT}" ] && { - DHCP_FOREGROUND=true - } - DHCP_CLIENT=${DHCP_CLIENT%-f} - if ! installed "$DHCP_CLIENT"; then - die 1 "You asked for DHCP client $DHCP_CLIENT, but I can't find it." - fi - ;; - # Alright, no DHCP? Then let's see if we have a subnet *and* gateway. - */*@*) - GATEWAY="${IPADDR#*@}" GATEWAY="${GATEWAY%%@*}" - IPADDR="${IPADDR%%@*}" - ;; - # No gateway? We need at least a subnet, anyway! - */*) : ;; - # ... No? Then stop right here. - *) - warn "The IP address should include a netmask." - die 1 "Maybe you meant $IPADDR/24 ?" - ;; - esac -} - -# If a DHCP method was specified, extract the DHCP options. -if [ "$DHCP_CLIENT" ]; then - case "$IPADDR" in - *:*) DHCP_OPTIONS="${IPADDR#*:}" ;; - esac -fi - -if [ "$DOCKERPID" ]; then - NSPID=$DOCKERPID -else - NSPID=$(head -n 1 "$(find "$CGROUPMNT" -name "$GUESTNAME" | head -n 1)/tasks") - [ "$NSPID" ] || { - # it is an alternative way to get the pid - NSPID=$(lxc-info -n "$GUESTNAME" | grep PID | grep -Eo '[0-9]+') - [ "$NSPID" ] || { - die 1 "Could not find a process inside container $GUESTNAME." - } - } -fi - -# Check if an incompatible VLAN device already exists -[ "$IFTYPE" = phys ] && [ "$VLAN" ] && [ -d "/sys/class/net/$IFNAME.VLAN" ] && { - ip -d link show "$IFNAME.$VLAN" | grep -q "vlan.*id $VLAN" || { - die 1 "$IFNAME.VLAN already exists but is not a VLAN device for tag $VLAN" - } -} - -[ ! -d /var/run/netns ] && mkdir -p /var/run/netns -rm -f "/var/run/netns/$NSPID" -ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID" - -# Check if we need to create a bridge. -[ "$IFTYPE" = bridge ] && [ ! -d "/sys/class/net/$IFNAME" ] && { - [ "$BRTYPE" = linux ] && { - (ip link add dev "$IFNAME" type bridge > /dev/null 2>&1) || (brctl addbr "$IFNAME") - ip link set "$IFNAME" up - } - [ "$BRTYPE" = openvswitch ] && { - ovs-vsctl add-br "$IFNAME" - } -} - -[ "$IFTYPE" != "route" ] && [ "$IFTYPE" != "dummy" ] && [ "$IFTYPE" != "rule" ] && [ "$IFTYPE" != "tc" ] && MTU=$(ip link show "$IFNAME" | awk '{print $5}') - -# If it's a bridge, we need to create a veth pair -[ "$IFTYPE" = bridge ] && { - if [ -z "$LOCAL_IFNAME" ]; then - LOCAL_IFNAME="v${CONTAINER_IFNAME}pl${NSPID}" - fi - GUEST_IFNAME="v${CONTAINER_IFNAME}pg${NSPID}" - # Does the link already exist? - if ip link show "$LOCAL_IFNAME" >/dev/null 2>&1; then - # link exists, is it in use? - if ip link show "$LOCAL_IFNAME" up | grep -q "UP"; then - echo "Link $LOCAL_IFNAME exists and is up" - exit 1 - fi - # delete the link so we can re-add it afterwards - ip link del "$LOCAL_IFNAME" - fi - ip link add name "$LOCAL_IFNAME" mtu "$MTU" type veth peer name "$GUEST_IFNAME" mtu "$MTU" - case "$BRTYPE" in - linux) - (ip link set "$LOCAL_IFNAME" master "$IFNAME" > /dev/null 2>&1) || (brctl addif "$IFNAME" "$LOCAL_IFNAME") - ;; - openvswitch) - if ! ovs-vsctl list-ports "$IFNAME" | grep -q "^${LOCAL_IFNAME}$"; then - ovs-vsctl add-port "$IFNAME" "$LOCAL_IFNAME" ${VLAN:+tag="$VLAN"} \ - -- set Interface "$LOCAL_IFNAME" \ - external-ids:pipework.interface="$LOCAL_IFNAME" \ - external-ids:pipework.bridge="$IFNAME" \ - ${DOCKERCID:+external-ids:pipework.containerid="$DOCKERCID"} \ - ${DOCKERCNAME:+external-ids:pipework.containername="$DOCKERCNAME"} \ - ${NSPID:+external-ids:pipework.nspid="$NSPID"} \ - ${VLAN:+external-ids:pipework.vlan="$VLAN"} - fi - ;; - esac - ip link set "$LOCAL_IFNAME" up -} - -# If it's a physical interface, create a macvlan subinterface -[ "$IFTYPE" = phys ] && { - [ "$VLAN" ] && { - [ ! -d "/sys/class/net/${IFNAME}.${VLAN}" ] && { - ip link add link "$IFNAME" name "$IFNAME.$VLAN" mtu "$MTU" type vlan id "$VLAN" - } - ip link set "$IFNAME" up - IFNAME=$IFNAME.$VLAN - } - - if [ ! -z "$DIRECT_PHYS" ]; then - GUEST_IFNAME=$IFNAME - else - GUEST_IFNAME=ph$NSPID$CONTAINER_IFNAME - ip link add link "$IFNAME" dev "$GUEST_IFNAME" mtu "$MTU" type macvlan mode bridge - fi - - ip link set "$IFNAME" up -} - -# If it's an IPoIB interface, create a virtual IPoIB interface (the IPoIB -# equivalent of a macvlan device) -# -# Note: no macvlan subinterface nor Ethernet bridge can be created on top of an -# IPoIB interface. InfiniBand is not Ethernet. IPoIB is an IP layer on top of -# InfiniBand, without an intermediate Ethernet layer. -[ "$IFTYPE" = ipoib ] && { - GUEST_IFNAME="${IFNAME}.${NSPID}" - - # If a partition key is provided, use it - [ "$PKEY" ] && { - GUEST_IFNAME="${IFNAME}.${PKEY}.${NSPID}" - PKEY="pkey 0x$PKEY" - } - - ip link add link "$IFNAME" name "$GUEST_IFNAME" type ipoib $PKEY - ip link set "$IFNAME" up -} - -# If its a dummy interface, create a dummy interface. -[ "$IFTYPE" = dummy ] && { - GUEST_IFNAME=du$NSPID$CONTAINER_IFNAME - ip link add dev "$GUEST_IFNAME" type dummy -} - -# If the `route` command was specified ... -if [ "$IFTYPE" = route ]; then - # ... discard the first two arguments and pass the rest to the route command. - shift 2 - ip netns exec "$NSPID" ip route "$@" -elif [ "$IFTYPE" = rule ] ; then - shift 2 - ip netns exec "$NSPID" ip rule "$@" -elif [ "$IFTYPE" = tc ] ; then - shift 2 - ip netns exec "$NSPID" tc "$@" -else - # Otherwise, run normally. - ip link set "$GUEST_IFNAME" netns "$NSPID" - ip netns exec "$NSPID" ip link set "$GUEST_IFNAME" name "$CONTAINER_IFNAME" - [ "$MACADDR" ] && ip netns exec "$NSPID" ip link set dev "$CONTAINER_IFNAME" address "$MACADDR" - - # When using any of the DHCP methods, we start a DHCP client in the - # network namespace of the container. With the 'dhcp' method, the - # client used is taken from the Docker busybox image (therefore - # requiring no specific client installed on the host). Other methods - # use a locally installed client. - case "$DHCP_CLIENT" in - dhcp) - docker run -d --net container:$GUESTNAME --cap-add NET_ADMIN \ - busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \ - $DHCP_OPTIONS \ - >/dev/null - ;; - udhcpc) - DHCP_Q="-q" - [ "$DHCP_FOREGROUND" ] && { - DHCP_OPTIONS="$DHCP_OPTIONS -f" - } - ip netns exec "$NSPID" "$DHCP_CLIENT" -qi "$CONTAINER_IFNAME" \ - -x "hostname:$GUESTNAME" \ - -p "/var/run/udhcpc.$GUESTNAME.pid" \ - $DHCP_OPTIONS - [ ! "$DHCP_FOREGROUND" ] && { - rm "/var/run/udhcpc.$GUESTNAME.pid" - } - ;; - dhclient) - ip netns exec "$NSPID" "$DHCP_CLIENT" "$CONTAINER_IFNAME" \ - -pf "/var/run/dhclient.$GUESTNAME.pid" \ - -lf "/etc/dhclient/dhclient.$GUESTNAME.leases" \ - $DHCP_OPTIONS - # kill dhclient after get ip address to prevent device be used after container close - [ ! "$DHCP_FOREGROUND" ] && { - kill "$(cat "/var/run/dhclient.$GUESTNAME.pid")" - rm "/var/run/dhclient.$GUESTNAME.pid" - } - ;; - dhcpcd) - ip netns exec "$NSPID" "$DHCP_CLIENT" -q "$CONTAINER_IFNAME" -h "$GUESTNAME" - ;; - "") - if installed ipcalc; then - eval $(ipcalc -b $IPADDR) - ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" brd "$BROADCAST" dev "$CONTAINER_IFNAME" - else - ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" dev "$CONTAINER_IFNAME" - fi - - [ "$GATEWAY" ] && { - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route delete default >/dev/null 2>&1 && true - } - ip netns exec "$NSPID" ip "$FAMILY_FLAG" link set "$CONTAINER_IFNAME" up - [ "$GATEWAY" ] && { - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route get "$GATEWAY" >/dev/null 2>&1 || \ - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route add "$GATEWAY/32" dev "$CONTAINER_IFNAME" - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route replace default via "$GATEWAY" dev "$CONTAINER_IFNAME" - } - ;; - esac - - # Give our ARP neighbors a nudge about the new interface - if installed arping; then - IPADDR=$(echo "$IPADDR" | cut -d/ -f1) - ip netns exec "$NSPID" arping -c 1 -A -I "$CONTAINER_IFNAME" "$IPADDR" > /dev/null 2>&1 || true - else - echo "Warning: arping not found; interface may not be immediately reachable" - fi -fi -# Remove NSPID to avoid `ip netns` catch it. -rm -f "/var/run/netns/$NSPID" - -# vim: set tabstop=2 shiftwidth=2 softtabstop=2 expandtab : -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I88ff40ca69c9ee76bef9bb8f24f66ca9d5ac751a Gerrit-Change-Number: 27159 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022