[S] Change in docker-playground[master]: ttcn3-asterisk: Enable debug for pjproject
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/36795?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ttcn3-asterisk: Enable debug for pjproject .. ttcn3-asterisk: Enable debug for pjproject Change-Id: I7de6ac31f7a75411fb515501611187f97e829ab3 --- M ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh A ttcn3-asterisk-ims-ue-test/asterisk/pjproject.conf 2 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/36795/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36795?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7de6ac31f7a75411fb515501611187f97e829ab3 Gerrit-Change-Number: 36795 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing Server field
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36797?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: SIP_Templates: Allow passing Server field .. SIP_Templates: Allow passing Server field This field is used by an IMS core. Change-Id: I7816eb4565fb027a2902c60c600a75b96dc293bc --- M library/SIP_Templates.ttcn 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/36797/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36797?usp=email 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: I7816eb4565fb027a2902c60c600a75b96dc293bc Gerrit-Change-Number: 36797 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing Server field
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36797?usp=email )
Change subject: SIP_Templates: Allow passing Server field
..
SIP_Templates: Allow passing Server field
This field is used by an IMS core.
Change-Id: I7816eb4565fb027a2902c60c600a75b96dc293bc
---
M library/SIP_Templates.ttcn
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/97/36797/1
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index 0b5c9bf..13cb10e 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -550,6 +550,7 @@
template (omit) Require require := omit,
template (omit) Security_client security_client := omit,
template (omit) Security_server security_server := omit,
+ template (omit) Server server := omit,
template (omit) Supported supported := omit,
template (omit) UserAgent userAgent := ts_UserAgent({
"osmo-ttcn3-hacks/0.23" }),
template (omit) WwwAuthenticate wwwAuthenticate := omit
@@ -576,6 +577,7 @@
require := require,
security_client := security_client,
security_server := security_server,
+ server := server,
supported := supported,
toField := {
fieldName := TO_E,
@@ -601,6 +603,7 @@
template Require require := *,
template Security_client security_client := *,
template Security_server security_server := *,
+ template Server server := *,
template Supported supported := *,
template UserAgent userAgent := *,
template WwwAuthenticate wwwAuthenticate := *
@@ -626,6 +629,7 @@
require := require,
security_client := security_client,
security_server := security_server,
+ server := server,
supported := supported,
toField := {
fieldName := TO_E,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36797?usp=email
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: I7816eb4565fb027a2902c60c600a75b96dc293bc
Gerrit-Change-Number: 36797
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing UserAgent field
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36796?usp=email )
Change subject: SIP_Templates: Allow passing UserAgent field
..
SIP_Templates: Allow passing UserAgent field
This way it can be set to omit, since this field is not set by an IMS
core.
Change-Id: Ib1e3e66b8fe46ad2626b07193dfcaa594f26352e
---
M library/SIP_Templates.ttcn
1 file changed, 26 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/96/36796/1
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index 9b3d188..0b5c9bf 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -242,6 +242,16 @@
optionsTags := optionsTags
}
+// [20.41 RFC2616 14.43]
+template (value) UserAgent ts_UserAgent(template (value) ServerVal_List
userAgentBody := {}) := {
+ fieldName := USER_AGENT_E,
+ userAgentBody := userAgentBody
+}
+template (present) UserAgent tr_UserAgent(template (present) ServerVal_List
userAgentBody := ?) := {
+ fieldName := USER_AGENT_E,
+ userAgentBody := userAgentBody
+}
+
template (value) SipAddr ts_SipAddr(template (value) HostPort host_port,
template (omit) UserInfo user_info := omit,
@@ -541,6 +551,7 @@
template (omit) Security_client security_client := omit,
template (omit) Security_server security_server := omit,
template (omit) Supported supported := omit,
+ template (omit) UserAgent userAgent := ts_UserAgent({
"osmo-ttcn3-hacks/0.23" }),
template (omit) WwwAuthenticate wwwAuthenticate := omit
) modifies ts_SIP_msgHeader_empty := {
allow := allow,
@@ -571,12 +582,7 @@
addressField := to_addr.addr,
toParams := to_addr.params
},
- userAgent := {
- fieldName := USER_AGENT_E,
- userAgentBody := {
- "osmo-ttcn3-hacks/0.23"
- }
- },
+ userAgent := userAgent,
via := via,
wwwAuthenticate := wwwAuthenticate
}
@@ -596,6 +602,7 @@
template Security_client security_client := *,
template Security_server security_server := *,
template Supported supported := *,
+ template UserAgent userAgent := *,
template WwwAuthenticate wwwAuthenticate := *
) modifies t_SIP_msgHeader_any := {
allow := allow,
@@ -625,7 +632,7 @@
addressField := to_addr.addr,
toParams := to_addr.params
},
- userAgent := *,
+ userAgent := userAgent,
via := via,
wwwAuthenticate := wwwAuthenticate
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36796?usp=email
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: Ib1e3e66b8fe46ad2626b07193dfcaa594f26352e
Gerrit-Change-Number: 36796
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in docker-playground[master]: ttcn3-asterisk: Enable debug for pjproject
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/36795?usp=email )
Change subject: ttcn3-asterisk: Enable debug for pjproject
..
ttcn3-asterisk: Enable debug for pjproject
Change-Id: I7de6ac31f7a75411fb515501611187f97e829ab3
---
M ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
A ttcn3-asterisk-ims-ue-test/asterisk/pjproject.conf
2 files changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/95/36795/1
diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
index f9b4bf5..b31015f 100755
--- a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
+++ b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
@@ -10,6 +10,7 @@
#cp -r /etc/asterisk/* "${ASTERISK_CFG_PATH}/"
cp /data/asterisk.conf "${ASTERISK_CFG_PATH}/"
#sed -i "s#/etc/asterisk#${ASTERISK_CFG_PATH}#"
"${ASTERISK_CFG_PATH}/asterisk.conf"
+cp /data/pjproject.conf "${ASTERISK_CFG_PATH}/"
cp /data/pjsip.conf "${ASTERISK_CFG_PATH}/"
cp /data/manager.conf "${ASTERISK_CFG_PATH}/"
cp /data/logger.conf "${ASTERISK_CFG_PATH}/"
diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjproject.conf
b/ttcn3-asterisk-ims-ue-test/asterisk/pjproject.conf
new file mode 100644
index 000..9a049f9
--- /dev/null
+++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjproject.conf
@@ -0,0 +1,13 @@
+[startup]
+;https://docs.asterisk.org/Certified-Asterisk_18.9_Documentation/API_Documentation/Module_Configuration/res_pjproject/
+; These logging level meanings are typically used by pjproject:
+; - 0: fatal error
+; - 1: error
+; - 2: warning
+; - 3: info
+; - 4: debug
+; - 5: trace
+; - 6: more detailed trace
+;
+; log_level 6 "trace" is too much.
+log_level=4
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36795?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I7de6ac31f7a75411fb515501611187f97e829ab3
Gerrit-Change-Number: 36795
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Add ts_SIP_Response_Trying
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36794?usp=email )
Change subject: SIP_Templates: Add ts_SIP_Response_Trying
..
SIP_Templates: Add ts_SIP_Response_Trying
Similar to ts_SIP_Response_Ringing. We also have the counterpart tr_*
for both Trying and Ringing. This is needed in a follow-up patch.
Change-Id: I05d8be9ce8860c610c509670392e14f1096fdddb
---
M library/SIP_Templates.ttcn
1 file changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/94/36794/1
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index c82d36d..9b3d188 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -806,7 +806,22 @@
messageBody := body,
payload := omit
}
-
+/* 100 Trying */
+template (value) PDU_SIP_Response
+ts_SIP_Response_Trying(
+ template (value) CallidString call_id,
+ template (value) SipAddr from_addr,
+ template (value) SipAddr to_addr,
+ Via via,
+ integer seq_nr,
+ charstring method := "INVITE",
+ template (omit) charstring body := omit) := {
+ statusLine := ts_SIP_StatusLine(100, "Trying"),
+ msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method,
seq_nr,
+via, f_ContentTypeOrOmit(ts_CT_SDP, body)),
+ messageBody := body,
+ payload := omit
+}
/* 180 Ringing */
template (value) PDU_SIP_Response
ts_SIP_Response_Ringing(
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36794?usp=email
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: I05d8be9ce8860c610c509670392e14f1096fdddb
Gerrit-Change-Number: 36794
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: Omit octet 3a in mobile-terminating setup requests if speech version ...
Attention is currently required from: neels, nt2mku.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/36784?usp=email )
Change subject: Omit octet 3a in mobile-terminating setup requests if speech
version is GSM-FR only
..
Patch Set 2:
(5 comments)
Commit Message:
https://gerrit.osmocom.org/c/libosmocore/+/36784/comment/04d19fe5_db78a8f1
PS2, Line 7: mobile-terminating setup requests
Please note that `gsm48_encode_bearer_cap()` is also used by osmocom-bb, so
this change also affects mobile originating CC SETUP messages. I suggest to
change commit name to `gsm48_encode_bearer_cap(): omit octet 3a if only GSM-FR
is supported`.
https://gerrit.osmocom.org/c/libosmocore/+/36784/comment/ff0a3a8a_0adcbf0e
PS2, Line 9: Some early GSM phones (like the Siemens P1 Porty) do not accept a
mobile-terminating call setup if octet 3a is present. If speech version is
GSM-FR (v1, 0x00) only, omit octet 3a.
cosmetic: the usual line length limit for COMMIT_MSG is 72 chars, so please add
line break(s).
Patchset:
PS2:
As can be seen, the build verification is failing because the output of
`tests/gsm0408` has changed:
```
--- experr 2024-05-12 19:45:16.719230477 +
+++ /build/builddir/tests/testsuite.dir/at-groups/28/stderr 2024-05-12
19:45:16.727230501 +
@@ -1,6 +1,3 @@
Incorrect encoded result of CSD 2400/V.22bis/transparent:
should: 07 a2 b8 81 21 13 43 83
is: 07 a2 88 81 21 13 43 83
-Incorrect encoded result of Speech, without octet 3a:
- should: 01 a0
- is: 02 20 80
--- expout 2024-05-12 19:45:16.719230477 +
+++ /build/builddir/tests/testsuite.dir/at-groups/28/stdout 2024-05-12
19:45:17.471232722 +
@@ -2,7 +2,7 @@
Test `CSD 4800/RLP/non-transparent' passed
Test `CSD 2400/V.22bis/transparent' failed
Test `Speech, all codecs' passed
-Test `Speech, without octet 3a' failed
+Test `Speech, without octet 3a' passed
Simple TMSI encoding testpassed
Simple IMSI encoding testpassed: [10] 17 08 99 10 07 00 00 00 64 02
```
You need to amend the expected output in order to make the build verification
pass, which can be done by running `make -C tests/ update_exp`.
File src/gsm/gsm48_ie.c:
https://gerrit.osmocom.org/c/libosmocore/+/36784/comment/1c7b7bea_045d8bdf
PS2, Line 330: /* if we have only one speech version, which is FR,
skip octet 3a */
Let's add a spec. reference here:
```
/* According to 3GPP TS 24.008, section 10.5.4.5.1, octet 3a etc. shall be
included only if the mobile station supports CTM text telephony or if it
supports at least one speech version for GERAN other than V1 (FR or HR). */
```
https://gerrit.osmocom.org/c/libosmocore/+/36784/comment/fea112e0_80f06b9f
PS2, Line 331: bcap->speech_ver[1] >= 0 || (bcap->speech_ver[0] & 0x0f) != 0x00
Consider the following input:
```
bcap->speech_ver[] = { GSM48_BCAP_SV_HR /* 0x01 */
GSM48_BCAP_SV_FR /* 0x00 */ };
```
In this case it's still only the speech version 1, but octets 3[ab] will be
encoded.
We should also still include octet(s) 3a etc. if `bcap->speech_ctm != 0`.
I suggest adding unit tests for that too.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36784?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia09abb32a8458384151a6ae28744835ea440fc5b
Gerrit-Change-Number: 36784
Gerrit-PatchSet: 2
Gerrit-Owner: nt2mku
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: neels
Gerrit-CC: pespin
Gerrit-Attention: neels
Gerrit-Attention: nt2mku
Gerrit-Comment-Date: Mon, 13 May 2024 14:36:38 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing Security_server field
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36792?usp=email )
Change subject: SIP_Templates: Allow passing Security_server field
..
SIP_Templates: Allow passing Security_server field
Change-Id: I7ee3d6dace39c784b0ec900d58a55421ac967269
---
M library/SIP_Templates.ttcn
1 file changed, 24 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/92/36792/1
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index 7e33b3b..d35813e 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -476,6 +476,17 @@
sec_mechanism_list := sec_mechanism_list
}
+template (present) Security_server
+tr_Security_server(template (present) Security_mechanism_list
sec_mechanism_list := ?) := {
+ fieldName := SECURITY_SERVER_E,
+ sec_mechanism_list := sec_mechanism_list
+}
+template (value) Security_server
+ts_Security_server(template (value) Security_mechanism_list
sec_mechanism_list) := {
+ fieldName := SECURITY_SERVER_E,
+ sec_mechanism_list := sec_mechanism_list
+}
+
template (present) Security_mechanism
tr_Security_mechanism(template (present) charstring name := ?,
template SemicolonParam_List params := *) := {
@@ -504,6 +515,7 @@
template (omit) Expires expires := omit,
template (omit) Require require := omit,
template (omit) Security_client security_client := omit,
+ template (omit) Security_server security_server := omit,
template (omit) Supported supported := omit,
template (omit) WwwAuthenticate wwwAuthenticate := omit
) modifies ts_SIP_msgHeader_empty := {
@@ -531,6 +543,7 @@
},
require := require,
security_client := security_client,
+ security_server := security_server,
supported := supported,
toField := {
fieldName := TO_E,
@@ -575,6 +588,7 @@
template Expires expires := *,
template Require require := *,
template Security_client security_client := *,
+ template Security_server security_server := *,
template Supported supported := *,
template WwwAuthenticate wwwAuthenticate := *
) modifies t_SIP_msgHeader_any := {
@@ -598,6 +612,7 @@
},
require := require,
security_client := security_client,
+ security_server := security_server,
supported := supported,
toField := {
fieldName := TO_E,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36792?usp=email
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: I7ee3d6dace39c784b0ec900d58a55421ac967269
Gerrit-Change-Number: 36792
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing 'Allow' field
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36793?usp=email )
Change subject: SIP_Templates: Allow passing 'Allow' field
..
SIP_Templates: Allow passing 'Allow' field
Change-Id: I10dd36d8c0ef8dbcbb58016c9684d877a0455b03
---
M library/SIP_Templates.ttcn
1 file changed, 37 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/93/36793/1
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index d35813e..c82d36d 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -66,6 +66,30 @@
}
}
+// [20.5]
+template (present) Allow tr_Allow(template Method_List methods := *) := {
+ fieldName := ALLOW_E,
+ methods := methods
+}
+template (value) Allow ts_Allow(template (omit) Method_List methods := omit)
:= {
+ fieldName := ALLOW_E,
+ methods := methods
+}
+function tr_AllowMethods(template Method_List allow_methods) return template
Allow {
+ if (istemplatekind(allow_methods, "omit")) {
+ return omit;
+ } else if (istemplatekind(allow_methods, "*")) {
+ return *;
+ } else if (istemplatekind(allow_methods, "?")) {
+ return ?;
+ }
+ var template (present) Allow ret := {
+ fieldName := ALLOW_E,
+ methods := allow_methods
+ }
+ return ret
+}
+
template (value) Credentials ts_Credentials_DigestResponse(template (value)
CommaParam_List digestResponse) := {
digestResponse := digestResponse
}
@@ -511,7 +535,7 @@
template (value) Via via,
template (omit) ContentType content_type := omit,
template (omit)Authorization authorization := omit,
- template (value) Method_List allow_methods :=
c_SIP_defaultMethods,
+ template (omit) Allow allow := ts_Allow(c_SIP_defaultMethods),
template (omit) Expires expires := omit,
template (omit) Require require := omit,
template (omit) Security_client security_client := omit,
@@ -519,10 +543,7 @@
template (omit) Supported supported := omit,
template (omit) WwwAuthenticate wwwAuthenticate := omit
) modifies ts_SIP_msgHeader_empty := {
- allow := {
- fieldName := ALLOW_E,
- methods := allow_methods
- },
+ allow := allow,
authorization := authorization,
callId := {
fieldName := CALL_ID_E,
@@ -560,21 +581,6 @@
wwwAuthenticate := wwwAuthenticate
}
-function tr_AllowMethods(template Method_List allow_methods) return template
Allow {
- if (istemplatekind(allow_methods, "omit")) {
- return omit;
- } else if (istemplatekind(allow_methods, "*")) {
- return *;
- } else if (istemplatekind(allow_methods, "?")) {
- return ?;
- }
- var template (present) Allow ret := {
- fieldName := ALLOW_E,
- methods := allow_methods
- }
- return ret
-}
-
template (present) MessageHeader
tr_SIP_msgh_std(template CallidString call_id,
template SipAddr from_addr,
@@ -584,7 +590,7 @@
template charstring method,
template ContentType content_type := *,
template integer seq_nr := ?,
- template Method_List allow_methods := *,
+ template Allow allow := *,
template Expires expires := *,
template Require require := *,
template Security_client security_client := *,
@@ -592,7 +598,7 @@
template Supported supported := *,
template WwwAuthenticate wwwAuthenticate := *
) modifies t_SIP_msgHeader_any := {
- allow := tr_AllowMethods(allow_methods),
+ allow := allow,
callId := {
fieldName := CALL_ID_E,
callid := call_id
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36793?usp=email
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: I10dd36d8c0ef8dbcbb58016c9684d877a0455b03
Gerrit-Change-Number: 36793
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-ggsn[master]: gtp/gtp_internal.h: new file
Attention is currently required from: laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36068?usp=email ) Change subject: gtp/gtp_internal.h: new file .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36068?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I72c40cbdec33449ca8104fb3cad8df1a9e07dfd7 Gerrit-Change-Number: 36068 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 13 May 2024 13:39:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ggsn[master]: gtp: remove conversion functions up
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36791?usp=email ) Change subject: gtp: remove conversion functions up .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36791?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I51e6a7c1161320fc54b0e8197ae57e4327976eb1 Gerrit-Change-Number: 36791 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 13:38:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp: remove unused conversion functions
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36790?usp=email ) Change subject: gtp: remove unused conversion functions .. Patch Set 1: (1 comment) Patchset: PS1: update TODO-RELEASE stating ABI change (removed API). -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I90e2750f6a6e3e6122e9c562103fda77d7326932 Gerrit-Change-Number: 36790 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 13:37:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp/gtp.c: move gtp_create_context_resp down
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36789?usp=email ) Change subject: gtp/gtp.c: move gtp_create_context_resp down .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I34efe7592013a8423f4f280758272d81f24b65fa Gerrit-Change-Number: 36789 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 13:36:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp/gsn_internal.h: new file
Attention is currently required from: laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36067?usp=email ) Change subject: gtp/gsn_internal.h: new file .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36067?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I999462e39411fc4ec7e50bd0212e870006fbc4f1 Gerrit-Change-Number: 36067 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 13 May 2024 13:36:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ggsn[master]: libgtp: move includes to osmocom/include/gtp
Attention is currently required from: laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36066?usp=email ) Change subject: libgtp: move includes to osmocom/include/gtp .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36066?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If7e01c61168819bf7120667344e40c857da5490b Gerrit-Change-Number: 36066 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 13 May 2024 13:35:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 13 May 2024 13:33:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in libosmocore[master]: Import in46_addr from OsmoGGSN
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36073?usp=email ) Change subject: Import in46_addr from OsmoGGSN .. Abandoned not needed for OS#6096, probably not worth finishing up -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36073?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I31078f130ec42aeaa5ead1dde82fdd1eb44d992b Gerrit-Change-Number: 36073 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on outer layer (backwards compatible)
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36072?usp=email ) Change subject: kernel-gtp: support IPv6 on outer layer (backwards compatible) .. Abandoned not needed for OS#6096, probably not worth finishing up -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36072?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I4212d847b6e1ad5ce120451a2d8a5578c48b90fe Gerrit-Change-Number: 36072 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in osmo-ggsn[master]: gtp/gsn: gtp_new: replace calloc with talloc_zero
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36071?usp=email ) Change subject: gtp/gsn: gtp_new: replace calloc with talloc_zero .. Abandoned not needed for OS#6096, probably not worth finishing up -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36071?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie10dd6f32a42513f6d2b5c7dd0dd84b4f0d20afb Gerrit-Change-Number: 36071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: abandon
[L] Change in osmo-ggsn[master]: Move in46_addr to libosmocore
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36070?usp=email ) Change subject: Move in46_addr to libosmocore .. Abandoned not needed for OS#6096, probably not worth finishing up -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36070?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8f4d9d78689909a149683583cfe36bcdc3f7cbc7 Gerrit-Change-Number: 36070 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in osmo-ggsn[master]: gsna2in46a: move and rename from in46a_from_gsna
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36069?usp=email ) Change subject: gsna2in46a: move and rename from in46a_from_gsna .. Abandoned not needed for OS#6096, probably not worth finishing up -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36069?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I54c8a4b1d3a02b71d5983badcd923fa39ce7dd84 Gerrit-Change-Number: 36069 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[M] Change in osmo-ggsn[master]: gtp/gtp_internal.h: new file
Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36068?usp=email ) Change subject: gtp/gtp_internal.h: new file .. Patch Set 2: (1 comment) File gtp/gtp_internal.h: https://gerrit.osmocom.org/c/osmo-ggsn/+/36068/comment/c652c097_15c15ffc PS1, Line 3: int gtp_echo_resp(struct gsn_t *gsn, int version, : struct sockaddr_in *peer, int fd, : void *pack, unsigned len); : int gtp_echo_ind(struct gsn_t *gsn, int version, : struct sockaddr_in *peer, int fd, : void *pack, unsigned len); : int gtp_echo_conf(struct gsn_t *gsn, int version, : struct sockaddr_in *peer, void *pack, unsigned len); : : int gtp_unsup_req(struct gsn_t *gsn, int version, : struct sockaddr_in *peer, : int fd, void *pack, unsigned len); : int gtp_unsup_ind(struct gsn_t *gsn, struct sockaddr_in *peer, : void *pack, unsigned len); : : int gtp_create_pdp_resp(struct gsn_t *gsn, int version, :struct pdp_t *pdp, uint8_t cause); : : int gtp_create_pdp_ind(struct gsn_t *gsn, int version, : struct sockaddr_in *peer, int fd, : void *pack, unsigned len); : : int gtp_create_pdp_conf(struct gsn_t *gsn, int version, :struct sockaddr_in *peer, :void *pack, unsigned len); : : int gtp_update_pdp_req(struct gsn_t *gsn, int version, void *cbp, : struct in_addr *inetaddr, struct pdp_t *pdp); : : int gtp_delete_pdp_req(struct gsn_t *gsn, int version, void *cbp, : struct pdp_t *pdp); : : int gtp_delete_pdp_resp(struct gsn_t *gsn, int version, :struct sockaddr_in *peer, int fd, :void *pack, unsigned len, :struct pdp_t *pdp, struct pdp_t *linked_pdp, :uint8_t cause, int teardown); : : int gtp_delete_pdp_ind(struct gsn_t *gsn, int version, : struct sockaddr_in *peer, int fd, : void *pack, unsigned len); : : int gtp_delete_pdp_conf(struct gsn_t *gsn, int version, :struct sockaddr_in *peer, :void *pack, unsigned len); > why do those gtp_* symbols need to be non-static and declared in any header > file at all? It looks t […] right, I've made them static now (see also new commits before this one). -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36068?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I72c40cbdec33449ca8104fb3cad8df1a9e07dfd7 Gerrit-Change-Number: 36068 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 13 May 2024 13:20:46 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[M] Change in osmo-ggsn[master]: libgtp: move includes to osmocom/include/gtp
Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36066?usp=email ) Change subject: libgtp: move includes to osmocom/include/gtp .. Patch Set 2: (1 comment) This change is ready for review. Commit Message: https://gerrit.osmocom.org/c/osmo-ggsn/+/36066/comment/e379d3b3_b85ff69c PS1, Line 17: Leave stub files in /usr/include/….h that include the files from the new : paths, for backwards compatibility. > oh, that's sad. […] good idea, I've implemented it like that. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36066?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If7e01c61168819bf7120667344e40c857da5490b Gerrit-Change-Number: 36066 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 13 May 2024 13:19:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp/gsn_internal.h: new file
Attention is currently required from: laforge, osmith, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36067?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified-1 by Jenkins Builder Change subject: gtp/gsn_internal.h: new file .. gtp/gsn_internal.h: new file Change-Id: I999462e39411fc4ec7e50bd0212e870006fbc4f1 --- M gtp/Makefile.am M gtp/gsn.c A gtp/gsn_internal.h M gtp/gtp.c M include/osmocom/gtp/gsn.h 5 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/67/36067/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36067?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I999462e39411fc4ec7e50bd0212e870006fbc4f1 Gerrit-Change-Number: 36067 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-ggsn[master]: gtp: remove conversion functions up
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/36791?usp=email )
Change subject: gtp: remove conversion functions up
..
gtp: remove conversion functions up
Move the conversion functions above the first user, so we can make
in_addr2gsna static in a follow-up commit and remove the extra
declaration.
Change-Id: I51e6a7c1161320fc54b0e8197ae57e4327976eb1
---
M gtp/gtp.c
1 file changed, 47 insertions(+), 34 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/91/36791/1
diff --git a/gtp/gtp.c b/gtp/gtp.c
index 9442b33..482875d 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -823,6 +823,40 @@
}
/* ***
+ * Conversion functions
+ */
+
+/* ***
+ * IP address conversion functions
+ * There exist several types of address representations:
+ * - eua: End User Address. (29.060, 7.7.27, message type 128)
+ * Used for signalling address to mobile station. Supports IPv4
+ * IPv6 x.25 etc. etc.
+ * - gsna: GSN Address. (29.060, 7.7.32, message type 133): IP address
+ * of GSN. If length is 4 it is IPv4. If length is 16 it is IPv6.
+ * - in_addr: IPv4 address struct.
+ * - sockaddr_in: Socket API representation of IP address and
+ * port number.
+ */
+
+int gsna2in_addr(struct in_addr *dst, struct ul16_t *gsna)
+{
+ memset(dst, 0, sizeof(struct in_addr));
+ if (gsna->l != 4)
+ return EOF; /* Return if not IPv4 */
+ memcpy(dst, gsna->v, gsna->l);
+ return 0;
+}
+
+int in_addr2gsna(struct ul16_t *gsna, struct in_addr *src)
+{
+ memset(gsna, 0, sizeof(struct ul16_t));
+ gsna->l = 4;
+ memcpy(gsna->v, src, gsna->l);
+ return 0;
+}
+
+/* ***
* Session management messages
* Messages: create, update and delete PDP context
*
@@ -3052,40 +3086,6 @@
return 0;
}
-/* ***
- * Conversion functions
- */
-
-/* ***
- * IP address conversion functions
- * There exist several types of address representations:
- * - eua: End User Address. (29.060, 7.7.27, message type 128)
- * Used for signalling address to mobile station. Supports IPv4
- * IPv6 x.25 etc. etc.
- * - gsna: GSN Address. (29.060, 7.7.32, message type 133): IP address
- * of GSN. If length is 4 it is IPv4. If length is 16 it is IPv6.
- * - in_addr: IPv4 address struct.
- * - sockaddr_in: Socket API representation of IP address and
- * port number.
- */
-
-int gsna2in_addr(struct in_addr *dst, struct ul16_t *gsna)
-{
- memset(dst, 0, sizeof(struct in_addr));
- if (gsna->l != 4)
- return EOF; /* Return if not IPv4 */
- memcpy(dst, gsna->v, gsna->l);
- return 0;
-}
-
-int in_addr2gsna(struct ul16_t *gsna, struct in_addr *src)
-{
- memset(gsna, 0, sizeof(struct ul16_t));
- gsna->l = 4;
- memcpy(gsna->v, src, gsna->l);
- return 0;
-}
-
/* TS 29.060 has yet again a different encoding for IMSIs than
* what we have in other places, so we cannot use the gsm48
* decoding functions. Also, libgtp uses an uint64_t in
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36791?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I51e6a7c1161320fc54b0e8197ae57e4327976eb1
Gerrit-Change-Number: 36791
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[M] Change in osmo-ggsn[master]: gtp/gtp_internal.h: new file
Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36068?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: gtp/gtp_internal.h: new file .. gtp/gtp_internal.h: new file While at it, move internal functions of gtp.h to a separate file too. Make all functions that are only used inside gtp.c static. The following APIs are unexpectedly public: * imsi_gtp2str gets used by pdp.h * gsna2in_addr, gtp_echo_req gets used by osmo-sgsn Change-Id: I72c40cbdec33449ca8104fb3cad8df1a9e07dfd7 --- M ggsn/ggsn.c M ggsn/ggsn_vty.c M ggsn/sgsn.c M gtp/Makefile.am M gtp/gtp.c A gtp/gtp_internal.h M include/osmocom/gtp/gtp.h M sgsnemu/sgsnemu.c 8 files changed, 54 insertions(+), 77 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/68/36068/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36068?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I72c40cbdec33449ca8104fb3cad8df1a9e07dfd7 Gerrit-Change-Number: 36068 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: osmith Gerrit-MessageType: newpatchset
[S] Change in osmo-ggsn[master]: gtp: remove unused conversion functions
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/36790?usp=email )
Change subject: gtp: remove unused conversion functions
..
gtp: remove unused conversion functions
Remove ipv42eua and eua2ipv4, which are in the "internal functions"
section of gtp.h, but are not used anywhere in the code anymore. This is
in preparation of moving the internal functions that are used in
multiple .c files into a separate header file, and to make the other
internal functions static. (Compiler complains about unused static
functions.)
Change-Id: I90e2750f6a6e3e6122e9c562103fda77d7326932
---
M gtp/gtp.c
M include/osmocom/gtp/gtp.h
2 files changed, 16 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/90/36790/1
diff --git a/gtp/gtp.c b/gtp/gtp.c
index 2d18fab..9442b33 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -3069,27 +3069,6 @@
* port number.
*/
-int ipv42eua(struct ul66_t *eua, struct in_addr *src)
-{
- eua->v[0] = PDP_EUA_ORG_IETF;
- eua->v[1] = PDP_EUA_TYPE_v4;
- if (src) {
- eua->l = 6;
- memcpy(>v[2], src, 4);
- } else {
- eua->l = 2;
- }
- return 0;
-}
-
-int eua2ipv4(struct in_addr *dst, struct ul66_t *eua)
-{
- if ((eua->l != 6) || (eua->v[0] != PDP_EUA_ORG_IETF) || (eua->v[1] !=
PDP_EUA_TYPE_v4))
- return -1; /* Not IPv4 address */
- memcpy(dst, >v[2], 4);
- return 0;
-}
-
int gsna2in_addr(struct in_addr *dst, struct ul16_t *gsna)
{
memset(dst, 0, sizeof(struct in_addr));
diff --git a/include/osmocom/gtp/gtp.h b/include/osmocom/gtp/gtp.h
index 7465cf1..7e6bb55 100644
--- a/include/osmocom/gtp/gtp.h
+++ b/include/osmocom/gtp/gtp.h
@@ -315,8 +315,6 @@
struct sockaddr_in *peer,
void *pack, unsigned len);
-extern int ipv42eua(struct ul66_t *eua, struct in_addr *src);
-extern int eua2ipv4(struct in_addr *dst, struct ul66_t *eua);
extern int gsna2in_addr(struct in_addr *dst, struct ul16_t *gsna);
extern int in_addr2gsna(struct ul16_t *gsna, struct in_addr *src);
extern const char *imsi_gtp2str(const uint64_t *imsi);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36790?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I90e2750f6a6e3e6122e9c562103fda77d7326932
Gerrit-Change-Number: 36790
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in osmo-ggsn[master]: gtp/gtp.c: move gtp_create_context_resp down
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/36789?usp=email )
Change subject: gtp/gtp.c: move gtp_create_context_resp down
..
gtp/gtp.c: move gtp_create_context_resp down
Move gtp_create_context_resp below gtp_create_pdp_resp, which it calls.
In a follow-up commit, we can make gtp_create_pdp_resp static and
remove the additional declaration.
Change-Id: I34efe7592013a8423f4f280758272d81f24b65fa
---
M gtp/gtp.c
1 file changed, 26 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/89/36789/1
diff --git a/gtp/gtp.c b/gtp/gtp.c
index bdf7e7d..2d18fab 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -990,19 +990,6 @@
return 0;
}
-/* API: Application response to context indication */
-int gtp_create_context_resp(struct gsn_t *gsn, struct pdp_t *pdp, int cause)
-{
-
- /* Now send off a reply to the peer */
- gtp_create_pdp_resp(gsn, pdp->version, pdp, cause);
-
- if (!gtp_cause_successful(cause))
- gtp_freepdp(gsn, pdp);
-
- return 0;
-}
-
/* Send Create PDP Context Response */
int gtp_create_pdp_resp(struct gsn_t *gsn, int version, struct pdp_t *pdp,
uint8_t cause)
@@ -1066,6 +1053,19 @@
pdp->fd, pdp->seq, pdp->tid);
}
+/* API: Application response to context indication */
+int gtp_create_context_resp(struct gsn_t *gsn, struct pdp_t *pdp, int cause)
+{
+
+ /* Now send off a reply to the peer */
+ gtp_create_pdp_resp(gsn, pdp->version, pdp, cause);
+
+ if (!gtp_cause_successful(cause))
+ gtp_freepdp(gsn, pdp);
+
+ return 0;
+}
+
/* Handle Create PDP Context Request */
int gtp_create_pdp_ind(struct gsn_t *gsn, int version,
struct sockaddr_in *peer, int fd,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36789?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I34efe7592013a8423f4f280758272d81f24b65fa
Gerrit-Change-Number: 36789
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
Attention is currently required from: laforge, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: KPI: Add initial set of DTAP message type rate counters .. KPI: Add initial set of DTAP message type rate counters >From an operational perspective, it may be interesting to know how many LU/RAU/Attach attempts, rejects and accepts are happening in a given hNodeB. Let's add some common infrastructure for DTAP related statistics as well as some initial counters. Related: SYS#6885 Depends: osmo-iuh.git Change-Id I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 --- M TODO-RELEASE M include/osmocom/hnbgw/hnbgw.h M include/osmocom/hnbgw/kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/hnbgw.c A src/osmo-hnbgw/kpi_dtap.c M src/osmo-hnbgw/kpi_ranap.c 8 files changed, 197 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/88/36788/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in libsmpp34[master]: contrib: remove rpm spec file
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libsmpp34/+/36728?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9
---
M Makefile.am
M configure.ac
D contrib/libsmpp34.spec.in
3 files changed, 12 insertions(+), 89 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index 9f85801..a0de168 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,6 @@
README.md \
.version \
debian \
- contrib/libsmpp34.spec.in \
git-version-gen \
$(NULL)
diff --git a/configure.ac b/configure.ac
index 9454953..0ec1701 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,5 @@
def_list/Makefile
binaries/Makefile
test_apps/Makefile
-libsmpp34.pc
-contrib/libsmpp34.spec])
+libsmpp34.pc])
AC_OUTPUT
diff --git a/contrib/libsmpp34.spec.in b/contrib/libsmpp34.spec.in
deleted file mode 100644
index eba7dbd..000
--- a/contrib/libsmpp34.spec.in
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# spec file for package libsmpp34
-#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2016, Martin Hauke
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-%define sover 1
-Name: libsmpp34
-Version:@VERSION@
-Release:0
-Summary:PDU SMPP packaging and unpackaging tool
-License:GPL-2.0-or-later AND LGPL-2.1-or-later
-Group: Development/Libraries/C and C++
-URL:https://osmocom.org/projects/libsmpp34
-Source: %{name}-%{version}.tar.xz
-BuildRequires: autoconf >= 2.57
-BuildRequires: libtool
-BuildRequires: pkgconfig >= 0.20
-BuildRequires: pkgconfig(libxml-2.0)
-
-%description
-The library provides the PDU handling of the SMPP-3.4 protocol.
-
-%package -n libsmpp34-%{sover}
-Summary:SMPP-3.4 protocol library
-License:LGPL-2.1-or-later
-Group: System/Libraries
-
-%description -n libsmpp34-%{sover}
-This library provides the Protocol Data Unit (PDU) handling of the
-SMPP-3.4 protocol. SMPP (Short Message Peer-to-Peer) is a protocol
-providing a data communication interface for the transfer of short
-message data between External Short Messaging Entities, Routing
-Entitites and Message Centres.
-
-%package -n libsmpp34-%{sover}-devel
-Summary:Development files for the SMPP-3.4 protocol library
-License:GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libsmpp34-%{sover} = %{version}
-
-%description -n libsmpp34-%{sover}-devel
-The library provides the PDU handling of the SMPP-3.4 protocol.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libsmpp34.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure --disable-static --includedir="%{_includedir}/%{name}"
-make %{?_smp_mflags}
-
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%post -n libsmpp34-%{sover} -p /sbin/ldconfig
-%postun -n libsmpp34-%{sover} -p /sbin/ldconfig
-
-%files -n libsmpp34-%{sover}
-%{_libdir}/libsmpp34.so.%{sover}*
-
-%files -n libsmpp34-%{sover}-devel
-%license COPYING
-%doc ChangeLog
-%{_includedir}/%{name}/
-%{_libdir}/libsmpp34.so
-%{_libdir}/pkgconfig/*.pc
-
-%changelog
--
To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/36728?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libsmpp34
Gerrit-Branch: master
Gerrit-Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9
Gerrit-Change-Number: 36728
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in libosmo-gprs[master]: contrib: remove rpm spec file
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/36724?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc
---
M Makefile.am
M configure.ac
D contrib/libosmo-gprs.spec.in
3 files changed, 12 insertions(+), 232 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index a1b8003..d45c2b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,6 @@
EXTRA_DIST = \
.version \
README.md \
- contrib/libosmo-gprs.spec.in \
git-version-gen \
debian \
$(NULL)
diff --git a/configure.ac b/configure.ac
index c29012d..cb212cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,5 @@
tests/rlcmac/Makefile
tests/sndcp/Makefile
tests/sm/Makefile
-Makefile
-contrib/libosmo-gprs.spec])
+Makefile])
AC_OUTPUT
diff --git a/contrib/libosmo-gprs.spec.in b/contrib/libosmo-gprs.spec.in
deleted file mode 100644
index ed43968..000
--- a/contrib/libosmo-gprs.spec.in
+++ /dev/null
@@ -1,229 +0,0 @@
-Name: libosmo-gprs
-Version:@VERSION@
-Release:0
-Summary:Osmocom GPRS libraries (CSN.1, RLC/MAC, LLC)
-License:GPL-2.0-or-later and AGPL-3.0-or-later
-Group: Hardware/Mobile
-URL:https://osmocom.org/projects/libosmo-gprs
-Source: %{name}-%{version}.tar.xz
-BuildRequires: autoconf-archive
-BuildRequires: automake >= 1.9
-BuildRequires: libtool >= 2
-BuildRequires: pkgconfig >= 0.20
-BuildRequires: pkgconfig(libosmocore) >= 1.7.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.7.0
-BuildRequires: pkgconfig(talloc)
-
-%description
-Osmocom GPRS libraries (CSN.1, RLC/MAC)
-
-This package provides Osmocom GPRS libraries used by osmocom-bb, osmo-pcu,
-and osmo-sgsn: libosmo-csn1, libosmo-gprs-llc, libosmo-gprs-rlcmac.
-
-%package -n libosmo-csn1-0
-Summary:CSN.1 (Concrete Syntax Notation 1) codec
-License:GPL-2.0-or-later
-Group: System/Libraries
-
-%description -n libosmo-csn1-0
-This package provides facilities for encoding, decoding, and declarative
-definition of protocols using CSN.1 (Concrete Syntax Notation 1). This
-implementation was originally developed by ST-Ericsson (Jari Sassi) and
-later adopted by Wireshark and osmo-pcu.
-
-%package -n libosmo-csn1-devel
-Summary:Development files for libosmo-csn1
-License:GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmo-csn1-0 = %{version}
-
-%description -n libosmo-csn1-devel
-This package provides development files for compiling a program using
-libosmo-csn1 - CSN.1 (Concrete Syntax Notation 1) codec.
-
-%package -n libosmo-gprs-gmm0
-Summary:Osmocom GPRS GMM library
-License:AGPL-3.0-or-later
-Group: System/Libraries
-
-%description -n libosmo-gprs-gmm0
-This package provides GMM (GPRS Mobility Management) layer for (E)GPRS.
-
-%package -n libosmo-gprs-gmm-devel
-Summary:Development files for libosmo-gprs-gmm
-License:AGPL-3.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmo-gprs-gmm0 = %{version}
-
-%description -n libosmo-gprs-gmm-devel
-This package provides development files for compiling a program using
-libosmo-gprs-gmm - GMM (GPRS Mobility Management) layer for (E)GPRS.
-
-%package -n libosmo-gprs-llc0
-Summary:Osmocom GPRS LLC library
-License:AGPL-3.0-or-later
-Group: System/Libraries
-
-%description -n libosmo-gprs-llc0
-This package provides LLC (Logical Link Control) layer for (E)GPRS.
-
-%package -n libosmo-gprs-llc-devel
-Summary:Development files for libosmo-gprs-llc
-License:AGPL-3.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmo-gprs-llc0 = %{version}
-
-%description -n libosmo-gprs-llc-devel
-This package provides development files for compiling a program using
-libosmo-gprs-llc - LLC (Logical Link Control) layer for (E)GPRS.
-
-%package -n libosmo-gprs-rlcmac0
-Summary:Osmocom GPRS RLC/MAC library
-License:GPL-2.0-or-later
-Group: System/Libraries
-
-%description -n libosmo-gprs-rlcmac0
-This package provides RLC/MAC protocol definitions for (E)GPRS.
-
-%package -n libosmo-gprs-rlcmac-devel
-Summary:Development files for libosmo-gprs-rlcmac
-License:GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmo-gprs-rlcmac0 = %{version}
-Requires: libosmo-csn1-devel = %{version}
-
-%description -n libosmo-gprs-rlcmac-devel
-This package provides development
[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 13 May 2024 12:23:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libsmpp34[master]: contrib: remove rpm spec file
Attention is currently required from: daniel, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/36728?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/36728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9 Gerrit-Change-Number: 36728 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Mon, 13 May 2024 12:22:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-gprs[master]: contrib: remove rpm spec file
Attention is currently required from: daniel, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/36724?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/36724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36724 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Mon, 13 May 2024 12:22:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hlr[master]: contrib: remove rpm spec file
Attention is currently required from: daniel, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/36738?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/36738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Idd67d52ca736c4e145387ea8d4030f9cf4b9596d Gerrit-Change-Number: 36738 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Mon, 13 May 2024 12:22:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hlr[master]: contrib: remove rpm spec file
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-hlr/+/36738?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Idd67d52ca736c4e145387ea8d4030f9cf4b9596d
---
M Makefile.am
M configure.ac
D contrib/osmo-hlr.spec.in
3 files changed, 11 insertions(+), 211 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index bb3d753..cc62d23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,6 @@
EXTRA_DIST = \
.version \
README.md \
- contrib/osmo-hlr.spec.in \
debian \
git-version-gen \
$(NULL)
diff --git a/configure.ac b/configure.ac
index 66bba75..61fcee8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,7 +203,6 @@
contrib/Makefile
contrib/systemd/Makefile
contrib/dgsm/Makefile
- contrib/osmo-hlr.spec
tests/Makefile
tests/auc/Makefile
tests/auc/gen_ts_55_205_test_sets/Makefile
diff --git a/contrib/osmo-hlr.spec.in b/contrib/osmo-hlr.spec.in
deleted file mode 100644
index ebf6ee6..000
--- a/contrib/osmo-hlr.spec.in
+++ /dev/null
@@ -1,209 +0,0 @@
-#
-# spec file for package osmo-hlr
-#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2016, Martin Hauke
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-Name: osmo-hlr
-Version:@VERSION@
-Release:0
-Summary:Osmocom Home Location Register for GSUP protocol towards
OsmoSGSN and OsmoCSCN
-License:AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Productivity/Telephony/Servers
-URL:https://osmocom.org/projects/osmo-hlr
-Source: %{name}-%{version}.tar.xz
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: pkgconfig >= 0.20
-BuildRequires: python3
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: pkgconfig(libosmoabis) >= 1.5.0
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-BuildRequires: pkgconfig(sqlite3)
-BuildRequires: pkgconfig(talloc) >= 2.0.1
-# only needed for populate_hlr_db.pl
-Requires: libdbi-drivers-dbd-sqlite3
-%{?systemd_requires}
-
-%description
-The GSUP HLR is a stand-alone HLR (Home Location Register) for SIM
-and USIM based subscribers which exposes the GSUP protocol towards
-its users. OsmoSGSN supports this protocol.
-
-osmo-gsup-hlr is still very simplistic. It is a single-threaded
-architecture and uses only sqlite3 tables as back-end. It is suitable
-for installations of the scale that OsmoNITB was able to handle. It
-also lacks various features like fine-grained control of subscribed
-services (like supplementary services).
-
-%package -n libosmo-gsup-client0
-Summary:Osmocom GSUP (General Subscriber Update Protocol) client
library
-License:GPL-2.0-or-later
-Group: System/Libraries
-
-%description -n libosmo-gsup-client0
-This is a shared library that can be used to implement client programs for
-the GSUP protocol. The typical GSUP server is OsmoHLR, with OsmoMSC, OsmoSGSN
-and External USSD Entities (EUSEs) using this library to implement clients.
-
-%package -n libosmo-gsup-client-devel
-Summary:Development files for the Osmocom GSUP client library
-License:GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmo-gsup-client0 = %{version}
-
-%description -n libosmo-gsup-client-devel
-This is a shared library that can be used to implement client programs for
-the GSUP protocol. The typical GSUP server is OsmoHLR, with OsmoMSC, OsmoSGSN
-and External USSD Entities (EUSEs) using this library to implement clients.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmo-gsup-client.
-
-%package -n libosmo-mslookup1
-Summary:Osmocom MS lookup library
-License:GPL-2.0-or-later
-Group: System/Libraries
-
-%description -n libosmo-mslookup1
-This shared library contains routines for looking up mobile subscribers.
-
[M] Change in osmo-ggsn[master]: contrib: remove rpm spec file
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/36737?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: I7cfe55fa2fda43da4eaa1e1b8d40b31d1c8aaf30
---
M Makefile.am
M configure.ac
D contrib/osmo-ggsn.spec.in
3 files changed, 11 insertions(+), 139 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/Makefile.am b/Makefile.am
index 5db4ac6..4d59c53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@
README.FreeBSD \
README.MacOSX \
README.md \
-contrib/osmo-ggsn.spec.in \
debian \
git-version-gen \
$(NULL)
diff --git a/configure.ac b/configure.ac
index ae93974..b73c5db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -262,7 +262,6 @@
doc/manuals/Makefile
contrib/Makefile
contrib/systemd/Makefile
- contrib/osmo-ggsn.spec
tests/Makefile
tests/lib/Makefile
tests/gtp/Makefile
diff --git a/contrib/osmo-ggsn.spec.in b/contrib/osmo-ggsn.spec.in
deleted file mode 100644
index 8334e4b..000
--- a/contrib/osmo-ggsn.spec.in
+++ /dev/null
@@ -1,137 +0,0 @@
-#
-# spec file for package osmo-ggsn
-#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-## Disable LTO for now since it breaks compilation of the tests
-## https://osmocom.org/issues/4114
-%define _lto_cflags %{nil}
-
-Name: osmo-ggsn
-Version:@VERSION@
-Release:0
-Summary:GPRS Support Node
-License:GPL-2.0-only AND LGPL-2.1-or-later
-Group: Productivity/Telephony/Servers
-URL:https://osmocom.org/projects/openggsn
-Source: %{name}-%{version}.tar.xz
-BuildRequires: libtool >= 2
-BuildRequires: pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: pkgconfig(libgtpnl) >= 1.2.0
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-Obsoletes: openggsn
-%{?systemd_requires}
-
-%description
-Osmo-GGSN is a C-language implementation of a GGSN (Gateway GPRS
-Support Node), a core network element of ETSI/3GPP cellular networks
-such as GPRS, EDGE, UMTS or HSPA.
-
-%package -n libgtp6
-Summary:Library implementing GTP between SGSN and GGSN
-License:GPL-2.0-only
-Group: System/Libraries
-
-%description -n libgtp6
-libgtp implements the GPRS Tunneling Protocol between SGSN and GGSN.
-
-%package -n libgtp-devel
-Summary:Development files for the GTP library
-License:GPL-2.0-only
-Group: Development/Libraries/C and C++
-Requires: libgtp6 = %{version}
-
-%description -n libgtp-devel
-libgtp implements the GPRS Tunneling Protocol between SGSN and GGSN.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libgtp.
-
-%package -n gtp-echo-responder
-Summary:Small program answering GTP ECHO Request with GTP ECHO Response
-License:MIT
-Group: System/Libraries
-
-%description -n gtp-echo-responder
-Small program answering GTP ECHO Request with GTP ECHO Response for both GTPCv1
-and GTPCv2.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
- --enable-gtp-linux \
- --disable-static \
- --docdir="%{_docdir}/%{name}" \
- --with-systemdsystemunitdir=%{_unitdir} \
- --includedir="%{_includedir}/%{name}"
-make %{?_smp_mflags} V=1
-
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%if 0%{?suse_version}
-%pre
-%service_add_pre %{name}.service
-
-%post
-%service_add_post %{name}.service
-
-%preun
-%service_del_preun %{name}.service
-
-%postun
-%service_del_postun %{name}.service
-%endif
-
-%post -n libgtp6 -p /sbin/ldconfig
-%postun -n libgtp6 -p /sbin/ldconfig
-
-%files
-%license COPYING
-%doc AUTHORS README.md
-%{_bindir}/osmo-ggsn
-%{_bindir}/sgsnemu
[M] Change in osmo-ggsn[master]: contrib: remove rpm spec file
Attention is currently required from: daniel, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36737?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36737?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7cfe55fa2fda43da4eaa1e1b8d40b31d1c8aaf30 Gerrit-Change-Number: 36737 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Mon, 13 May 2024 12:22:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 13 May 2024 12:22:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures
Attention is currently required from: pespin.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email )
Change subject: ranap_common: Implement support for missing procedures
..
Patch Set 1:
(1 comment)
File src/ranap_common_cn.c:
https://gerrit.osmocom.org/c/osmo-iuh/+/36787/comment/5f9d9f69_86e58777
PS1, Line 75: case RANAP_ProcedureCode_id_RelocationPreparation: /*
RELOCATION REQUIRED */
> why this rename to "relocatioNRequered" here?
We didn't create the ASN.1 of RANAP. In it, the RelocationPreparation
procedure has a Relocation{Required,Command,PreparationFailure} as message
types...
```
relocationPreparation RANAP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE RelocationRequired
SUCCESSFUL OUTCOME RelocationCommand
UNSUCCESSFUL OUTCOMERelocationPreparationFailure
PROCEDURE CODE id-RelocationPreparation
CRITICALITY reject
}
```
--
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: I7dea74102da8b610ff2a310c5814f5c89f08e7a6
Gerrit-Change-Number: 36787
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Mon, 13 May 2024 12:18:38 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures .. Patch Set 1: (1 comment) File src/ranap_common_cn.c: https://gerrit.osmocom.org/c/osmo-iuh/+/36787/comment/014367d6_fc785173 PS1, Line 75: case RANAP_ProcedureCode_id_RelocationPreparation: /* RELOCATION REQUIRED */ why this rename to "relocatioNRequered" here? -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 13 May 2024 12:14:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters .. KPI: Add initial set of DTAP message type rate counters >From an operational perspective, it may be interesting to know how many LU/RAU/Attach attempts, rejects and accepts are happening in a given hNodeB. Let's add some common infrastructure for DTAP related statistics as well as some initial counters. Related: SYS#6885 Depends: osmo-iuh.git Change-Id I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 --- M include/osmocom/hnbgw/hnbgw.h M include/osmocom/hnbgw/kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/hnbgw.c A src/osmo-hnbgw/kpi_dtap.c M src/osmo-hnbgw/kpi_ranap.c 7 files changed, 196 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/88/36788/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email )
Change subject: KPI: Add initial set of DTAP message type rate counters
..
KPI: Add initial set of DTAP message type rate counters
>From an operational perspective, it may be interesting to know how many
LU/RAU/Attach attempts, rejects and accepts are happening in a given
hNodeB. Let's add some common infrastructure for DTAP related
statistics as well as some initial counters.
Related: SYS#6885
Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032
---
M include/osmocom/hnbgw/hnbgw.h
M include/osmocom/hnbgw/kpi.h
M src/osmo-hnbgw/Makefile.am
M src/osmo-hnbgw/context_map_rua.c
M src/osmo-hnbgw/hnbgw.c
A src/osmo-hnbgw/kpi_dtap.c
M src/osmo-hnbgw/kpi_ranap.c
7 files changed, 195 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/88/36788/1
diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h
index 8daf713..dc046a0 100644
--- a/include/osmocom/hnbgw/hnbgw.h
+++ b/include/osmocom/hnbgw/hnbgw.h
@@ -136,6 +136,18 @@
HNB_CTR_CS_PAGING_ATTEMPTED,
HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL,
+
+ HNB_CTR_DTAP_CS_LU_REQ,
+ HNB_CTR_DTAP_CS_LU_ACC,
+ HNB_CTR_DTAP_CS_LU_REJ,
+
+ HNB_CTR_DTAP_PS_ATT_REQ,
+ HNB_CTR_DTAP_PS_ATT_ACK,
+ HNB_CTR_DTAP_PS_ATT_REJ,
+
+ HNB_CTR_DTAP_PS_RAU_REQ,
+ HNB_CTR_DTAP_PS_RAU_ACK,
+ HNB_CTR_DTAP_PS_RAU_REJ,
};
enum hnb_stat {
diff --git a/include/osmocom/hnbgw/kpi.h b/include/osmocom/hnbgw/kpi.h
index 63f3477..2a13972 100644
--- a/include/osmocom/hnbgw/kpi.h
+++ b/include/osmocom/hnbgw/kpi.h
@@ -6,3 +6,6 @@
void kpi_ranap_process_ul(struct hnbgw_context_map *map, ranap_message *ranap);
void kpi_ranap_process_dl(struct hnbgw_context_map *map, ranap_message *ranap);
+
+void kpi_dtap_process_ul(struct hnbgw_context_map *map, const uint8_t *buf,
unsigned int len, uint8_t sapi);
+void kpi_dtap_process_dl(struct hnbgw_context_map *map, const uint8_t *buf,
unsigned int len, uint8_t sapi);
diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am
index 0727f30..9dffabf 100644
--- a/src/osmo-hnbgw/Makefile.am
+++ b/src/osmo-hnbgw/Makefile.am
@@ -44,6 +44,7 @@
cnlink.c \
ranap_rab_ass.c \
mgw_fsm.c \
+ kpi_dtap.c \
kpi_ranap.c \
tdefs.c \
$(NULL)
diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c
index f37ded8..d5b2cb7 100644
--- a/src/osmo-hnbgw/context_map_rua.c
+++ b/src/osmo-hnbgw/context_map_rua.c
@@ -220,10 +220,9 @@
switch (event) {
case MAP_RUA_EV_RX_CONNECT:
+ /* not needed for RAB assignment scanning, but for KPI scanning
*/
+ handle_rx_rua(fi, ranap_msg);
map_rua_fsm_state_chg(MAP_RUA_ST_CONNECTED);
- /* The Connect will never be a RAB Assignment response, so no
need for handle_rx_rua() (which decodes
-* the RANAP message to detect a RAB Assignment response). Just
forward to SCCP as is. */
- map_sccp_dispatch(map, MAP_SCCP_EV_TX_DATA_REQUEST, ranap_msg);
return;
case MAP_RUA_EV_RX_DISCONNECT:
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index fe29c29..b102bcf 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -464,6 +464,18 @@
[HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL] = {
"rab:cs:active_milliseconds:total", "Cumulative number of
milliseconds of CS RAB activity" },
+
+ [HNB_CTR_DTAP_CS_LU_REQ] = { "dtap:cs:location_update:req", "CS
Location Update Requests" },
+ [HNB_CTR_DTAP_CS_LU_ACC] = { "dtap:cs:location_update:accept", "CS
Location Update Accepts" },
+ [HNB_CTR_DTAP_CS_LU_REJ] = { "dtap:cs:location_update:reject", "CS
Location Update Rejects" },
+
+ [HNB_CTR_DTAP_PS_ATT_REQ] = { "dtap:ps:attach:req", "PS Attach
Requests" },
+ [HNB_CTR_DTAP_PS_ATT_ACK] = { "dtap:ps:attach:accept", "PS Attach
Accepts" },
+ [HNB_CTR_DTAP_PS_ATT_REJ] = { "dtap:ps:attach:reject", "PS Attach
Rejects" },
+
+ [HNB_CTR_DTAP_PS_RAU_REQ] = { "dtap:ps:routing_area_update:req", "PS
Attach Requests" },
+ [HNB_CTR_DTAP_PS_RAU_ACK] = { "dtap:ps:routing_area_update:accept", "PS
Attach Accepts" },
+ [HNB_CTR_DTAP_PS_RAU_REJ] = { "dtap:ps:routing_area_update:reject", "PS
Attach Rejects" },
};
const struct rate_ctr_group_desc hnb_ctrg_desc = {
diff --git a/src/osmo-hnbgw/kpi_dtap.c b/src/osmo-hnbgw/kpi_dtap.c
new file mode 100644
index 000..8d47208
--- /dev/null
+++ b/src/osmo-hnbgw/kpi_dtap.c
@@ -0,0 +1,111 @@
+/* KPI (statistics, counters) at DTAP level */
+/* (C) 2024 by Harald Welte
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: AGPL-3.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of
[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures .. ranap_common: Implement support for missing procedures Both the RAN and the CN side of ranap_common were missing support for decoding requests and/or responses for a number of RANAP procedures. This patch adds all of them a of TS 25.413 Release 12 except those related to MBMS or SRVCC. Related: SYS#6885 Change-Id: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 --- M src/ranap_common_cn.c M src/ranap_common_ran.c 2 files changed, 284 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/87/36787/1 diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c index 56ac4e8..749df8d 100644 --- a/src/ranap_common_cn.c +++ b/src/ranap_common_cn.c @@ -72,6 +72,20 @@ /* FIXME this is not a message received by CN (used by hnb-test) */ rc = ranap_decode_iu_releasecommandies(>msg.iu_ReleaseCommandIEs, >value); break; + case RANAP_ProcedureCode_id_RelocationPreparation: /* RELOCATION REQUIRED */ + rc = ranap_decode_relocationrequiredies(>msg.relocationRequiredIEs, >value); + break; + //case RANAP_ProcedureCode_id_RelocationDetect: /* no member in ranap_message */ + //case RANAP_ProcedureCode_id_RelocationComplete: /* no member in ranap_message */ + case RANAP_ProcedureCode_id_RelocationCancel: + rc = ranap_decode_relocationcancelies(>msg.relocationCancelIEs, >value); + break; + case RANAP_ProcedureCode_id_ForwardSRNS_Context: + rc = ranap_decode_forwardsrns_contexties(>msg.forwardSRNS_ContextIEs, >value); + break; + case RANAP_ProcedureCode_id_LocationReport: + rc = ranap_decode_locationreporties(>msg.locationReportIEs, >value); + break; default: LOGP(DRANAP, LOGL_INFO, "Received RANAP Procedure %s (CO, IM) from RNC. Decode not implemented\n", @@ -116,6 +130,20 @@ /* FIXME this is not a message received by CN (used by hnb-test) */ ranap_free_iu_releasecommandies(>msg.iu_ReleaseCommandIEs); break; + case RANAP_ProcedureCode_id_RelocationPreparation: /* RELOCATION REQUIRED */ + ranap_free_relocationrequiredies(>msg.relocationRequiredIEs); + break; + //case RANAP_ProcedureCode_id_RelocationDetect: /* no member in ranap_message */ + //case RANAP_ProcedureCode_id_RelocationComplete: /* no member in ranap_message */ + case RANAP_ProcedureCode_id_RelocationCancel: + ranap_free_relocationcancelies(>msg.relocationCancelIEs); + break; + case RANAP_ProcedureCode_id_ForwardSRNS_Context: + ranap_free_forwardsrns_contexties(>msg.forwardSRNS_ContextIEs); + break; + case RANAP_ProcedureCode_id_LocationReport: + ranap_free_locationreporties(>msg.locationReportIEs); + break; default: LOGP(DRANAP, LOGL_INFO, "Freeing RANAP Procedure %s (CO, IM) from RNC not implemented\n", @@ -139,13 +167,25 @@ /* RAB assignment response */ rc = ranap_decode_rab_assignmentresponseies(>msg.raB_AssignmentResponseIEs, >value); break; + case RANAP_ProcedureCode_id_Iu_Release: + /* Iu release Complete; confirmation of CN-initiated release */ + rc = ranap_decode_iu_releasecompleteies(>msg.iu_ReleaseCompleteIEs, >value); + break; + case RANAP_ProcedureCode_id_RelocationResourceAllocation: + rc = ranap_decode_relocationrequestacknowledgeies(>msg.relocationRequestAcknowledgeIEs, >value); + break; + case RANAP_ProcedureCode_id_SRNS_ContextTransfer: + rc = ranap_decode_srns_contextresponseies(>msg.srnS_ContextResponseIEs, >value); + break; case RANAP_ProcedureCode_id_SecurityModeControl: /* Security Mode Complete */ rc = ranap_decode_securitymodecompleteies(>msg.securityModeCompleteIEs, >value); break; - case RANAP_ProcedureCode_id_Iu_Release: - /* Iu release Complete; confirmation of CN-initiated release */ - rc = ranap_decode_iu_releasecompleteies(>msg.iu_ReleaseCompleteIEs, >value); + case RANAP_ProcedureCode_id_DataVolumeReport: + rc = ranap_decode_datavolumereporties(>msg.dataVolumeReportIEs, >value); + break; + case RANAP_ProcedureCode_id_LocationRelatedData: + rc = ranap_decode_locationrelateddataresponseies(>msg.locationRelatedDataResponseIEs, >value);
[S] Change in docker-playground[master]: ttcn3-asterisk: Enable debug in log file
Attention is currently required from: jolly, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36786?usp=email ) Change subject: ttcn3-asterisk: Enable debug in log file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36786?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifbc8208507ba47e9f6a1eaf5a43465d2a1af08c1 Gerrit-Change-Number: 36786 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: osmith Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 13 May 2024 11:37:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-asterisk: Enable debug in log file
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/36786?usp=email )
Change subject: ttcn3-asterisk: Enable debug in log file
..
ttcn3-asterisk: Enable debug in log file
Change-Id: Ifbc8208507ba47e9f6a1eaf5a43465d2a1af08c1
---
M ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf
M ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
A ttcn3-asterisk-ims-ue-test/asterisk/logger.conf
3 files changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/86/36786/1
diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf
b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf
index a17d606..3ec5f17 100644
--- a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf
+++ b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf
@@ -14,7 +14,7 @@
[options]
;verbose = 3
-;debug = 3
+debug = 1
;trace = 0 ; Set the trace level.
;refdebug = yes; Enable reference count debug logging.
;alwaysfork = yes ; Same as -F at startup.
diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
index c79408d..f9b4bf5 100755
--- a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
+++ b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
@@ -12,6 +12,7 @@
#sed -i "s#/etc/asterisk#${ASTERISK_CFG_PATH}#"
"${ASTERISK_CFG_PATH}/asterisk.conf"
cp /data/pjsip.conf "${ASTERISK_CFG_PATH}/"
cp /data/manager.conf "${ASTERISK_CFG_PATH}/"
+cp /data/logger.conf "${ASTERISK_CFG_PATH}/"
cat /data/extensions.conf >>"${ASTERISK_CFG_PATH}/extensions.conf"
/usr/sbin/asterisk -C "${ASTERISK_CFG_PATH}/asterisk.conf" -f -g -v -d
diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/logger.conf
b/ttcn3-asterisk-ims-ue-test/asterisk/logger.conf
new file mode 100644
index 000..292e624
--- /dev/null
+++ b/ttcn3-asterisk-ims-ue-test/asterisk/logger.conf
@@ -0,0 +1,5 @@
+[logfiles]
+;messages = notice,warning,error
+;console = verbose,notice,warning,error,debug,trace,dtmf
+console = *
+;security = security
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36786?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ifbc8208507ba47e9f6a1eaf5a43465d2a1af08c1
Gerrit-Change-Number: 36786
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-mgw[master]: doc: example configs: fix deprecation warnings
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36785?usp=email ) Change subject: doc: example configs: fix deprecation warnings .. doc: example configs: fix deprecation warnings Fix for: range must end at an odd port number, autocorrecting port (16000) to: 16001 % Deprecated 'sdp audio-payload number <0-255>' config no longer has any effect % Deprecated 'sdp audio-payload name NAME' config no longer has any effect % Deprecated 'loop (0|1)' config no longer has any effect Change-Id: I62a4fd119de48039c3c450d5323d8f9b7de8120f --- M doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg M doc/examples/osmo-mgw/osmo-mgw.cfg 2 files changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/85/36785/1 diff --git a/doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg b/doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg index dcf3663..cf53de2 100644 --- a/doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg +++ b/doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg @@ -14,15 +14,12 @@ e1_line 0 port 0 mgcp bind ip 127.0.0.1 - rtp port-range 4002 16000 + rtp port-range 4002 16001 rtp bind-ip 127.0.0.1 rtp ip-probing rtp ip-dscp 46 bind port 2427 - sdp audio payload number 98 - sdp audio payload name GSM number endpoints 512 - loop 0 force-realloc 1 rtcp-omit rtp-patch ssrc diff --git a/doc/examples/osmo-mgw/osmo-mgw.cfg b/doc/examples/osmo-mgw/osmo-mgw.cfg index 8535efe..0542edd 100644 --- a/doc/examples/osmo-mgw/osmo-mgw.cfg +++ b/doc/examples/osmo-mgw/osmo-mgw.cfg @@ -11,15 +11,12 @@ mgcp bind ip 127.0.0.1 - rtp port-range 4002 16000 + rtp port-range 4002 16001 rtp bind-ip 127.0.0.1 rtp ip-probing rtp ip-dscp 46 bind port 2427 - sdp audio payload number 98 - sdp audio payload name GSM number endpoints 512 - loop 0 force-realloc 1 rtcp-omit rtp-patch ssrc -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36785?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I62a4fd119de48039c3c450d5323d8f9b7de8120f Gerrit-Change-Number: 36785 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing Require,Security-client,Supported fields...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36782?usp=email )
Change subject: SIP_Templates: Allow passing Require,Security-client,Supported
fields to REGISTER templates
..
SIP_Templates: Allow passing Require,Security-client,Supported fields to
REGISTER templates
These fields are used in IMS.
Change-Id: I20a0df5633db8c0e7732659c1316b85e63317afc
---
M library/SIP_Templates.ttcn
1 file changed, 84 insertions(+), 2 deletions(-)
Approvals:
osmith: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index 2498f49..7e33b3b 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -197,6 +197,28 @@
deltaSec := deltaSec
}
+
+// [20.32]
+template (value) Require ts_Require(template (value) OptionTag_List
optionsTags := {}) := {
+ fieldName := REQUIRE_E,
+ optionsTags := optionsTags
+}
+template (present) Require tr_Require(template (present) OptionTag_List
optionsTags := ?) := {
+ fieldName := REQUIRE_E,
+ optionsTags := optionsTags
+}
+
+// [20.37]
+template (value) Supported ts_Supported(template (value) OptionTag_List
optionsTags := {}) := {
+ fieldName := SUPPORTED_E,
+ optionsTags := optionsTags
+}
+template (present) Supported tr_Supported(template (present) OptionTag_List
optionsTags := ?) := {
+ fieldName := SUPPORTED_E,
+ optionsTags := optionsTags
+}
+
+
template (value) SipAddr ts_SipAddr(template (value) HostPort host_port,
template (omit) UserInfo user_info := omit,
template (omit) charstring displayName :=
omit,
@@ -442,6 +464,31 @@
challenge := challenge
}
+// RFC3329
+template (present) Security_client
+tr_Security_client(template (present) Security_mechanism_list
sec_mechanism_list := ?) := {
+ fieldName := SECURITY_CLIENT_E,
+ sec_mechanism_list := sec_mechanism_list
+}
+template (value) Security_client
+ts_Security_client(template (value) Security_mechanism_list
sec_mechanism_list) := {
+ fieldName := SECURITY_CLIENT_E,
+ sec_mechanism_list := sec_mechanism_list
+}
+
+template (present) Security_mechanism
+tr_Security_mechanism(template (present) charstring name := ?,
+ template SemicolonParam_List params := *) := {
+ mechanism_name := name,
+ mechanism_params := params
+}
+template (value) Security_mechanism
+ts_Security_mechanism(template (value) charstring name,
+ template (omit) SemicolonParam_List params := omit) := {
+ mechanism_name := name,
+ mechanism_params := params
+}
+
template (value) MessageHeader ts_SIP_msgHeader_empty := c_SIP_msgHeader_empty;
template (value) MessageHeader
ts_SIP_msgh_std(template (value) CallidString call_id,
@@ -455,6 +502,9 @@
template (omit)Authorization authorization := omit,
template (value) Method_List allow_methods :=
c_SIP_defaultMethods,
template (omit) Expires expires := omit,
+ template (omit) Require require := omit,
+ template (omit) Security_client security_client := omit,
+ template (omit) Supported supported := omit,
template (omit) WwwAuthenticate wwwAuthenticate := omit
) modifies ts_SIP_msgHeader_empty := {
allow := {
@@ -479,6 +529,9 @@
addressField := from_addr.addr,
fromParams := from_addr.params
},
+ require := require,
+ security_client := security_client,
+ supported := supported,
toField := {
fieldName := TO_E,
addressField := to_addr.addr,
@@ -520,6 +573,9 @@
template integer seq_nr := ?,
template Method_List allow_methods := *,
template Expires expires := *,
+ template Require require := *,
+ template Security_client security_client := *,
+ template Supported supported := *,
template WwwAuthenticate wwwAuthenticate := *
) modifies t_SIP_msgHeader_any := {
allow := tr_AllowMethods(allow_methods),
@@ -540,6 +596,9 @@
addressField := from_addr.addr,
fromParams := from_addr.params
},
+ require := require,
+ security_client := security_client,
+ supported := supported,
toField := {
fieldName := TO_E,
addressField := to_addr.addr,
@@ -561,13 +620,19 @@
template (omit) Contact contact,
template (omit) Expires expires,
template (omit) Authorization authorization := omit,
+ template (omit) Require require := omit,
+ template
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow setting transport in Via templates
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36780?usp=email )
Change subject: SIP_Templates: Allow setting transport in Via templates
..
SIP_Templates: Allow setting transport in Via templates
This is needed when using IMS, since TCP is used.
Change-Id: Id45491615bcb5c074ef4fc298cbb24b2e034972d
---
M asterisk/SIP_ConnectionHandler.ttcn
M library/SIP_Templates.ttcn
2 files changed, 17 insertions(+), 3 deletions(-)
Approvals:
osmith: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/asterisk/SIP_ConnectionHandler.ttcn
b/asterisk/SIP_ConnectionHandler.ttcn
index 13b5f04..9c7cca5 100644
--- a/asterisk/SIP_ConnectionHandler.ttcn
+++ b/asterisk/SIP_ConnectionHandler.ttcn
@@ -178,6 +178,7 @@
{ id := "received", paramValue := g_pars.remote_sip_host }
}; */
return tr_Via_from(via_req.viaBody[0].sentBy,
+ via_req.viaBody[0].sentProtocol.transport,
via_resp_params);
}
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index 3492dc4..e22646c 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -372,22 +372,24 @@
mediaType := "application/sdp"
};
-template (value) Via ts_Via_from(template (value) HostPort addr) := {
+template (value) Via ts_Via_from(template (value) HostPort addr,
+template (value) charstring transport :=
"UDP") := {
fieldName := VIA_E,
viaBody := {
{
- sentProtocol := { "SIP", "2.0", "UDP" },
+ sentProtocol := { "SIP", "2.0", transport },
sentBy := addr,
viaParams := omit
}
}
}
template (present) Via tr_Via_from(template (present) HostPort host_port := ?,
+ template (present) charstring transport := ?,
template SemicolonParam_List viaParams := *)
:= {
fieldName := VIA_E,
viaBody := {
{
- sentProtocol := { "SIP", "2.0", "UDP" },
+ sentProtocol := { "SIP", "2.0", ? },
sentBy := host_port,
viaParams := viaParams
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36780?usp=email
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: Id45491615bcb5c074ef4fc298cbb24b2e034972d
Gerrit-Change-Number: 36780
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing WwwAuthenticate to ts_SIP_msgh_std
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36781?usp=email )
Change subject: SIP_Templates: Allow passing WwwAuthenticate to ts_SIP_msgh_std
..
SIP_Templates: Allow passing WwwAuthenticate to ts_SIP_msgh_std
The field could already be passed to its tr_* counterpart, but not the
the ts_* one.
Change-Id: Ibc6cc5320f24ce82165c1b2140bad30cb356f8ae
---
M library/SIP_Templates.ttcn
1 file changed, 16 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index e22646c..2498f49 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -454,7 +454,8 @@
template (omit) ContentType content_type := omit,
template (omit)Authorization authorization := omit,
template (value) Method_List allow_methods :=
c_SIP_defaultMethods,
- template (omit) Expires expires := omit
+ template (omit) Expires expires := omit,
+ template (omit) WwwAuthenticate wwwAuthenticate := omit
) modifies ts_SIP_msgHeader_empty := {
allow := {
fieldName := ALLOW_E,
@@ -489,7 +490,8 @@
"osmo-ttcn3-hacks/0.23"
}
},
- via := via
+ via := via,
+ wwwAuthenticate := wwwAuthenticate
}
function tr_AllowMethods(template Method_List allow_methods) return template
Allow {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36781?usp=email
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: Ibc6cc5320f24ce82165c1b2140bad30cb356f8ae
Gerrit-Change-Number: 36781
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing Require,Security-client,Supported fields...
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36782?usp=email ) Change subject: SIP_Templates: Allow passing Require,Security-client,Supported fields to REGISTER templates .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36782?usp=email 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: I20a0df5633db8c0e7732659c1316b85e63317afc Gerrit-Change-Number: 36782 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 13 May 2024 09:30:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing WwwAuthenticate to ts_SIP_msgh_std
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36781?usp=email ) Change subject: SIP_Templates: Allow passing WwwAuthenticate to ts_SIP_msgh_std .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36781?usp=email 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: Ibc6cc5320f24ce82165c1b2140bad30cb356f8ae Gerrit-Change-Number: 36781 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 13 May 2024 09:29:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow setting transport in Via templates
Attention is currently required from: jolly, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36780?usp=email ) Change subject: SIP_Templates: Allow setting transport in Via templates .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36780?usp=email 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: Id45491615bcb5c074ef4fc298cbb24b2e034972d Gerrit-Change-Number: 36780 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 13 May 2024 09:28:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: asterisk: Enable capabilities required to set up ipsec
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36775?usp=email ) Change subject: asterisk: Enable capabilities required to set up ipsec .. asterisk: Enable capabilities required to set up ipsec Change-Id: I2dc040cf87169c9a59dc7e9f1af0e1c17bde6683 --- M asterisk-master/Dockerfile M ttcn3-asterisk-ims-ue-test/jenkins.sh 2 files changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve diff --git a/asterisk-master/Dockerfile b/asterisk-master/Dockerfile index 789aeb5..0281176 100644 --- a/asterisk-master/Dockerfile +++ b/asterisk-master/Dockerfile @@ -77,3 +77,6 @@ make install && \ make samples && \ ldconfig + +# Required to set up ipsec: +RUNsetcap 'cap_net_admin,cap_sys_resource=ep' /usr/sbin/asterisk diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh b/ttcn3-asterisk-ims-ue-test/jenkins.sh index 7e5361d..aa5749d 100755 --- a/ttcn3-asterisk-ims-ue-test/jenkins.sh +++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh @@ -22,6 +22,8 @@ echo Starting container with Asterisk docker run --rm \ + --cap-add=NET_ADMIN \ + --cap-add=SYS_RESOURCE \ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -v $VOL_BASE_DIR/asterisk:/data \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36775?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2dc040cf87169c9a59dc7e9f1af0e1c17bde6683 Gerrit-Change-Number: 36775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in docker-playground[master]: asterisk: Enable capabilities required to set up ipsec
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36775?usp=email ) Change subject: asterisk: Enable capabilities required to set up ipsec .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: As I received via IM: "cap_sys_resource is required to set entries in the ipsec security tables of the kernel." -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36775?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2dc040cf87169c9a59dc7e9f1af0e1c17bde6683 Gerrit-Change-Number: 36775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 13 May 2024 09:21:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in ...osmo-epdg[master]: docs: add basic manual of the osmo-epdg
Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783?usp=email ) Change subject: docs: add basic manual of the osmo-epdg .. Patch Set 2: (10 comments) File docs/manuals/chapters/epcrequirements.adoc: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783/comment/f775bb18_e8b7bbf0 PS2, Line 14: An UE will request attributes via IKEv2 which are translated into additional PCO in GTP on the S2b Additional PCO (APCO) https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783/comment/65893856_906a002a PS2, Line 15: reference point. THe PGW should support additional PCO via S2b. Additional PCO https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783/comment/b585c145_0cd234a0 PS2, Line 16: open5gs supports additional PCO by 2.7.1. Additional PCO since v2.7.1 File docs/manuals/chapters/osmo-epdg.adoc: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783/comment/e520aea9_1a2a4c19 PS2, Line 16: For Debian based distribution osmocom provides packages repositories: package repositories https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783/comment/84e29a8d_b09c7912 PS2, Line 29: = CEIA: Connection for strongSwan I recall this was usually CEAI? whatever it's meaning is :) File docs/manuals/chapters/overview.adoc: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783/comment/7755c924_64b9d17a PS2, Line 27: Further the osmo-epdg is using strongSwan to handle the communication towards UEs. "Furthermore, osmo-epdg speaks with strongswan to handle communication..." ? https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783/comment/5a7256c5_d1652f79 PS2, Line 34: * Linux generic policy routing and firewall (user plane) I think we are missing mention to the gtp kernel module somewhere in here. File docs/manuals/chapters/strongswan.adoc: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783/comment/db65ba9c_64c8e356 PS2, Line 8: strongSwan has been extended to support this role in the osmo-epdg. this means it was forked, so information on where to find it should be provided here. https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783/comment/18f3aa1e_7ccf945f PS2, Line 44: Further it allows the osmo-epdg/erlang to: Moreover? I don't think you can use Further this way; I may be wrong though. File docs/manuals/ue-connects.msc: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783/comment/f7bc7b8d_b3574f72 PS2, Line 8: > trailing whitespace Please fix. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I596b6a351b7356aefa7e69f95521bc4012b9264b Gerrit-Change-Number: 36783 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Mon, 13 May 2024 09:15:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in docker-playground[master]: asterisk: Enable capabilities required to set up ipsec
Attention is currently required from: laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36775?usp=email ) Change subject: asterisk: Enable capabilities required to set up ipsec .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36775?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2dc040cf87169c9a59dc7e9f1af0e1c17bde6683 Gerrit-Change-Number: 36775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 13 May 2024 09:07:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in gapk[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/gapk/+/36720?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: I320f56a3d60143c0da1b7d8dc8e206f0d5b0210e
---
M configure.ac
D contrib/gapk.spec.in
2 files changed, 12 insertions(+), 152 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/configure.ac b/configure.ac
index 9a318bb..904b371 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,7 @@
AC_FUNC_MALLOC
AC_CHECK_FUNCS([memset])
-AC_CONFIG_FILES([contrib/gapk.spec
+AC_CONFIG_FILES([
Makefile
src/Makefile
libgsmhr/Makefile
diff --git a/contrib/gapk.spec.in b/contrib/gapk.spec.in
deleted file mode 100644
index e0466f4..000
--- a/contrib/gapk.spec.in
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-# spec file for package gapk
-#
-# Copyright (c) 2017, Martin Hauke
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-%define with_amr 1
-%define with_gsmhr 1
-%define sover 0
-
-Name: gapk
-Version:@VERSION@
-Release:0
-Summary:GSM Audio Pocket Knife
-License:GPL-3.0-only
-Group: Productivity/Multimedia/Sound/Editors and Convertors
-URL:http://www.osmocom.org
-Source: gapk-%{version}.tar.xz
-# License: for libgsmhr see 3gpp website
-Source1:0606_421.zip
-Patch1: gapk-disable-codec-dl-during-build.diff
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libgsm-devel
-BuildRequires: libtool
-BuildRequires: pkgconfig
-BuildRequires: python
-BuildRequires: pkgconfig(alsa)
-BuildRequires: pkgconfig(libosmocodec)
-BuildRequires: pkgconfig(libosmocore)
-# Benchmarking is currently only supported on intel platforms...
-ExclusiveArch: %{ix86} x86_64
-%if 0%{with_amr}
-BuildRequires: libopencore-amr-devel
-%endif
-
-%description
-gapk is intented to be the GSM Audio Pocket Knife.
-It encodes/decodes several GSM-related audio-codes (HR,FR,EFR)
-
-%if 0%{with_gsmhr}
-%package -n libgsmhr0
-Summary:Shared Library part of libgsmhr
-License:NonFree
-Group: Development/Libraries/C and C++
-
-%description -n libgsmhr0
-libgsmhr contains a standard implementation of the European GSM 06.20
-provisional standard for GSM Half Rate speech speech transcoding.
-
-%package -n libgsmhr-devel
-Summary:Development files for the gsmhr library
-License:NonFree
-Group: Development/Libraries/C and C++
-Requires: libgsmhr0 = %{version}
-
-%description -n libgsmhr-devel
-libgsmhr contains a standard implementation of the European GSM 06.20
-provisional standard for GSM Half Rate speech speech transcoding.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libgsmhr.
-%endif
-
-%package -n libosmogapk%{sover}
-Summary:Shared library part of GSM Audio Pocket Knife (GAPK)
-License:GPL-3.0-only
-Group: Development/Libraries/C and C++
-
-%description -n libosmogapk%{sover}
-Shared library part of GSM Audio Pocket Knife (GAPK).
-
-%package -n libosmogapk-devel
-Summary:Development files for the GAPK library
-License:GPL-3.0-only
-Group: Development/Libraries/C and C++
-Requires: libosmogapk%{sover} = %{version}
-
-%description -n libosmogapk-devel
-Shared library part of GSM Audio Pocket Knife (GAPK).
-
-This subpackage contains the development files for the Osmocom GAPK
-library.
-
-%prep
-%setup -q
-%if 0%{with_gsmhr}
-%patch1 -p1
-cp %{SOURCE1} libgsmhr/
-%endif
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
-%if 0%{with_gsmhr}
---enable-gsmhr \
-%endif
---disable-static
-make V=1 %{?_smp_mflags}
-
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-%if 0%{with_gsmhr}
-## GSM HR tests (6,9,13,14) are known to be broken -
https://osmocom.org/issues/2514
-make %{?_smp_mflags} check || :
-%else
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-%endif
-
-%if 0%{with_gsmhr}
-%post -n libgsmhr0 -p /sbin/ldconfig
-%postun -n libgsmhr0 -p /sbin/ldconfig
-%endif
-
-%post -n libosmogapk%{sover} -p /sbin/ldconfig
[M] Change in osmo-bsc[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/36731?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Ic79cde09bf7d5e96e439b1883d3a3fe5568bdbf1
---
M Makefile.am
M configure.ac
D contrib/osmo-bsc.spec.in
3 files changed, 11 insertions(+), 168 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Makefile.am b/Makefile.am
index 0deeb1e..be0d755 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@
EXTRA_DIST = \
.version \
README.md \
-contrib/osmo-bsc.spec.in \
debian \
git-version-gen \
osmoappdesc.py \
diff --git a/configure.ac b/configure.ac
index 6214539..7a4d557 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251,5 +251,4 @@
doc/manuals/Makefile
contrib/Makefile
contrib/systemd/Makefile
-contrib/osmo-bsc.spec
Makefile)
diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in
deleted file mode 100644
index 464630e..000
--- a/contrib/osmo-bsc.spec.in
+++ /dev/null
@@ -1,166 +0,0 @@
-#
-# spec file for package osmo-bsc
-#
-# Copyright (c) 2017, Martin Hauke
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-## Disable LTO for now since it breaks compilation of the tests
-## https://osmocom.org/issues/4113
-%define _lto_cflags %{nil}
-
-Name: osmo-bsc
-Version:@VERSION@
-Release:0
-Summary:OsmoBSC: Osmocom's Base Station Controller for 2G CS mobile
networks
-License:AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Hardware/Mobile
-URL:https://osmocom.org/projects/osmobsc
-Source: %{name}-%{version}.tar.xz
-BuildRequires: automake >= 1.9
-BuildRequires: libtool >= 2
-BuildRequires: pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: pkgconfig(libcrypto) >= 0.9.5
-BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.12.0
-BuildRequires: pkgconfig(libosmo-netif) >= 1.4.0
-BuildRequires: pkgconfig(libosmo-sigtran) >= 1.8.0
-BuildRequires: pkgconfig(libosmoabis) >= 1.5.0
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires: pkgconfig(libosmogb) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-BuildRequires: pkgconfig(talloc)
-%{?systemd_requires}
-
-%description
-OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile
networks.
-
-%package abisip-find
-Summary:CLI utility to find ip.access compatible BTS
-License:GPL-2.0-or-later
-Group: Productivity/Telephony/Utilities
-
-%description abisip-find
-Command line utility to find ip.access compatible BTS.
-
-%package ipaccess-utils
-Summary:Command line utilities for ip.access nanoBTS
-License:GPL-2.0-or-later
-Group: Productivity/Telephony/Utilities
-
-%description ipaccess-utils
-This package contains utilities that are specific for nanoBTS when being
-used together with OpenBSC. It contains mainly two tools: ipaccess-config
-and ipaccess-proxy.
-
-%package bs11-utils
-Summary:Command line utilities for Siemens BS-11 BTS
-License:GPL-2.0-or-later
-Group: Productivity/Telephony/Utilities
-
-%description bs11-utils
-There is a tool in this package for configuring the Siemens BS-11 BTS.
-Additionally, it contains one tool for making use of an ISDN-card and the
-public telephone network as frequency standard for the E1 line.
-
-%package meas-utils
-Summary:Command line utilities for OsmoBSC's measurement reports
-License:GPL-2.0-or-later
-Group: Productivity/Telephony/Utilities
-
-%description meas-utils
-This package contains utilities for handling OsmoBSC's measurement reports
- * meas_json to convert measurement feed into a JSON feed
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
- --docdir=%{_docdir}/%{name} \
- --with-systemdsystemunitdir=%{_unitdir}
-make %{?_smp_mflags}
-
-%install
-%make_install
-
-%preun
-%if 0%{?suse_version}
-%service_del_preun %{name}.service
-%endif
-
-%postun
-%if 0%{?suse_version}
[M] Change in libosmo-pfcp[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-pfcp/+/36726?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc
---
M Makefile.am
M configure.ac
D contrib/libosmo-pfcp.spec.in
3 files changed, 11 insertions(+), 114 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Makefile.am b/Makefile.am
index 626aaf4..a04a301 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@
BUILT_SOURCES = $(top_srcdir)/.version
EXTRA_DIST = \
.version \
-contrib/libosmo-pfcp.spec.in \
debian \
git-version-gen \
$(NULL)
diff --git a/configure.ac b/configure.ac
index 6775969..ba99cb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,6 @@
AC_CONFIG_FILES([
libosmo-gtlv.pc
libosmo-pfcp.pc
-contrib/libosmo-pfcp.spec
include/Makefile
include/osmocom/Makefile
include/osmocom/gtlv/Makefile
diff --git a/contrib/libosmo-pfcp.spec.in b/contrib/libosmo-pfcp.spec.in
deleted file mode 100644
index 86dfee7..000
--- a/contrib/libosmo-pfcp.spec.in
+++ /dev/null
@@ -1,112 +0,0 @@
-Name: libosmo-pfcp
-Version:@VERSION@
-Release:0
-Summary:PFCP protocol encoding, decoding and endpoint implementation
-License:GPL-2.0-or-later
-Group: Hardware/Mobile
-URL:https://osmocom.org/projects/libosmo-pfcp
-Source: %{name}-%{version}.tar.xz
-BuildRequires: autoconf-archive
-BuildRequires: automake >= 1.9
-BuildRequires: libtool >= 2
-BuildRequires: lksctp-tools-devel
-BuildRequires: pkgconfig >= 0.20
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(talloc)
-
-%description
-Description: Osmocom PFCP protocol implementation (metapackage)
-
-Install Osmocom PFCP and generic TLV protocol libraries.
-libosmo-gtlv and libosmo-pfcp
-
-
-%package -n libosmo-gtlv1
-Summary:Generic TLV and TLIV protocol support
-License:GPL-2.0-or-later
-Group: System/Libraries
-
-%description -n libosmo-gtlv1
-Decoding, encoding and logging of protocols using a Tag-Length-Value and/or
-Tag-Length-Instance-Value structure.
-
-
-%package -n libosmo-gtlv-devel
-Summary:Development files for libosmo-pfcp
-License:GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmo-gtlv1 = %{version}
-
-%description -n libosmo-gtlv-devel
-libosmo-pfcp implements decoding, encoding and endpoint implementation of the
-Packet Forwarding Control Protocol (3GPP TS 29.244). This package in particular
-contains the files for compiling a program using this library.
-
-
-%package -n libosmo-pfcp0
-Summary:PFCP protocol support
-License:GPL-2.0-or-later
-Group: System/Libraries
-
-%description -n libosmo-pfcp0
-PFCP protocol support: Decoding, encoding and endpoint implementation of the
-Packet Forwarding Control Protocol (3GPP TS 29.244).
-
-
-%package -n libosmo-pfcp-devel
-Summary:Development files for libosmo-pfcp
-License:GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmo-pfcp0 = %{version}
-
-%description -n libosmo-pfcp-devel
-libosmo-pfcp implements decoding, encoding and endpoint implementation of the
-Packet Forwarding Control Protocol (3GPP TS 29.244). This package in particular
-contains the files for compiling a program using this library.
-
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
- --disable-static \
- --includedir="%_includedir/%name"
-make %{?_smp_mflags}
-
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%post -n libosmo-gtlv1 -p /sbin/ldconfig
-%postun -n libosmo-gtlv1 -p /sbin/ldconfig
-%post -n libosmo-pfcp0 -p /sbin/ldconfig
-%postun -n libosmo-pfcp0 -p /sbin/ldconfig
-
-%files -n libosmo-gtlv1
-%{_libdir}/libosmo-gtlv.so.1*
-
-%files -n libosmo-gtlv-devel
-%dir %{_includedir}/%{name}
-%dir %{_includedir}/%{name}/osmocom
-%{_includedir}/%{name}/osmocom/gtlv
-%{_libdir}/libosmo-gtlv.so
-%{_libdir}/pkgconfig/libosmo-gtlv.pc
-
-%files -n libosmo-pfcp0
-%{_libdir}/libosmo-pfcp.so.0*
-
-%files -n libosmo-pfcp-devel
-%dir %{_includedir}/%{name}
-%dir %{_includedir}/%{name}/osmocom
-%{_includedir}/%{name}/osmocom/pfcp
-%{_libdir}/libosmo-pfcp.so
-%{_libdir}/pkgconfig/libosmo-pfcp.pc
-
-%changelog
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/36726?usp=email
To unsubscribe, or for help writing mail filters, visit
[M] Change in osmo-bts[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/36732?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Ic79cde09bf7d5e96e439b1883d3a3fe5568bdbf1
---
M Makefile.am
M configure.ac
D contrib/osmo-bts.spec.in
3 files changed, 11 insertions(+), 118 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index e64db39..6dad46c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@
.version \
README.md \
contrib/dump_docs.py \
- contrib/osmo-bts.spec.in \
debian \
git-version-gen \
$(NULL)
diff --git a/configure.ac b/configure.ac
index 6d5d931..79958dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -452,5 +452,4 @@
contrib/Makefile
contrib/ber/Makefile
contrib/systemd/Makefile
-contrib/osmo-bts.spec
Makefile)
diff --git a/contrib/osmo-bts.spec.in b/contrib/osmo-bts.spec.in
deleted file mode 100644
index 73731cf..000
--- a/contrib/osmo-bts.spec.in
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# spec file for package osmo-bts
-#
-# Copyright (c) 2017, Martin Hauke
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-Name: osmo-bts
-Version:@VERSION@
-Release:0
-Summary:Osmocom BTS-Side code (Abis, scheduling)
-License:AGPL-3.0-or-later AND GPL-2.0-only
-Group: Productivity/Telephony/Servers
-URL:https://osmocom.org/projects/osmobts
-Source: %{name}-%{version}.tar.xz
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: pkgconfig(libosmocodec) >= 1.9.0
-BuildRequires: pkgconfig(libosmocoding) >= 1.9.0
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-BuildRequires: pkgconfig(libosmoabis) >= 1.5.0
-BuildRequires: pkgconfig(libosmotrau) >= 1.5.0
-BuildRequires: pkgconfig(libosmo-netif) >= 1.4.0
-%{?systemd_requires}
-
-%description
-Osmocom BTS-Side code (A-bis, scheduling).
-
-%package -n osmo-bts-virtual
-Summary:Virtual Osmocom GSM BTS (no RF hardware; GSMTAP/UDP)
-License:GPL-2.0-or-later
-Group: Productivity/Telephony/Utilities
-
-%description -n osmo-bts-virtual
-This version of OsmoBTS doesn't use actual GSM PHY/Hardware/RF, but
-utilizes GSMTAP-over-UDP frames for the Um interface. This is useful
-in fully virtualized setups e.g. in combination with OsmocomBB virt_phy.
-
-%package -n osmo-bts-omldummy
-Summary:Osmocom CI: Bring up only OML without RSL
-License:GPL-2.0-or-later
-Group: Productivity/Telephony/Utilities
-
-%description -n osmo-bts-omldummy
-This is used only in integration testing, where in the TTCN-3 testsuite
-we currently have no A-bis OML implementation, but only a RSL one.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
---docdir="%{_docdir}/%{name}" \
---with-systemdsystemunitdir=%{_unitdir} \
---enable-trx
-make V=1 %{?_smp_mflags}
-
-%install
-%make_install
-
-%if 0%{?suse_version}
-%pre%service_add_preosmo-bts-trx.service
-%post %service_add_post osmo-bts-trx.service
-%preun %service_del_preun osmo-bts-trx.service
-%postun %service_del_postun osmo-bts-trx.service
-%previrtual %service_add_preosmo-bts-virtual.service
-%post virtual %service_add_post osmo-bts-virtual.service
-%preun virtual %service_del_preun osmo-bts-virtual.service
-%postun virtual %service_del_postun osmo-bts-virtual.service
-%endif
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%files
-%license COPYING
-%doc README.md
-%dir %{_docdir}/%{name}
-%dir %{_docdir}/%{name}/examples
-%dir %{_docdir}/%{name}/examples/osmo-bts-trx
-%{_docdir}/%{name}/examples/osmo-bts-trx/osmo-bts-trx-calypso.cfg
-%{_docdir}/%{name}/examples/osmo-bts-trx/osmo-bts-trx.cfg
-%dir %{_docdir}/%{name}/examples/osmo-bts-virtual
-%{_docdir}/%{name}/examples/osmo-bts-virtual/osmo-bts-virtual.cfg
[M] Change in osmo-gbproxy[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gbproxy/+/36736?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: I7cfe55fa2fda43da4eaa1e1b8d40b31d1c8aaf30
---
M Makefile.am
M configure.ac
D contrib/osmo-gbproxy.spec.in
3 files changed, 11 insertions(+), 85 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Makefile.am b/Makefile.am
index bb4758b..9fffd21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@
BUILT_SOURCES = $(top_srcdir)/.version
EXTRA_DIST = \
.version \
-contrib/osmo-gbproxy.spec.in \
debian \
git-version-gen \
osmoappdesc.py \
diff --git a/configure.ac b/configure.ac
index 4608db1..a2cf82a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,5 +225,4 @@
doc/manuals/Makefile
contrib/Makefile
contrib/systemd/Makefile
-contrib/osmo-gbproxy.spec
Makefile)
diff --git a/contrib/osmo-gbproxy.spec.in b/contrib/osmo-gbproxy.spec.in
deleted file mode 100644
index ffde90c..000
--- a/contrib/osmo-gbproxy.spec.in
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# spec file for package osmo-gbproxy
-#
-# Copyright (c) 2017, Martin Hauke
-# Copyright (c) 2021, sysmocom - s.f.m.c. GmbH
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-## Disable LTO for now since it breaks compilation of the tests
-## https://osmocom.org/issues/4116
-%define _lto_cflags %{nil}
-
-Name: osmo-gbproxy
-Version:@VERSION@
-Release:0
-Summary:Osmocom GPRS Gb Interface Proxy
-License:AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Productivity/Telephony/Servers
-URL:https://osmocom.org/projects/osmo-gbproxy
-Source: %{name}-%{version}.tar.xz
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: pkgconfig
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: pkgconfig(libcrypto) >= 0.9.5
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires: pkgconfig(libosmogb) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-%{?systemd_requires}
-
-%description
-The purpose of the Gb proxy is to aggregate the Gb links of multiple
-BSS's and present them in one Gb link to the SGSN.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
- --docdir=%{_docdir}/%{name} \
- --with-systemdsystemunitdir=%{_unitdir}
-make %{?_smp_mflags}
-
-%install
-%make_install
-
-%if 0%{?suse_version}
-%preun %service_del_preun %{name}.service
-%postun %service_del_postun %{name}.service
-%pre%service_add_pre%{name}.service
-%post %service_add_post %{name}.service
-%endif
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%files
-%doc AUTHORS README.md
-%dir %{_docdir}/%{name}/examples
-%dir %{_docdir}/%{name}/examples/osmo-gbproxy
-%{_docdir}/%{name}/examples/osmo-gbproxy/osmo-gbproxy.cfg
-%{_docdir}/%{name}/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg
-%{_docdir}/%{name}/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg
-%{_bindir}/osmo-gbproxy
-%dir %{_sysconfdir}/osmocom
-%config(noreplace) %{_sysconfdir}/osmocom/osmo-gbproxy.cfg
-%{_unitdir}/%{name}.service
-
-%changelog
--
To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/36736?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gbproxy
Gerrit-Branch: master
Gerrit-Change-Id: I7cfe55fa2fda43da4eaa1e1b8d40b31d1c8aaf30
Gerrit-Change-Number: 36736
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-bsc-nat[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/36730?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9
---
M Makefile.am
M configure.ac
D contrib/osmo-bsc-nat.spec.in
3 files changed, 11 insertions(+), 94 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index 9648f0e..2168ff0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@
BUILT_SOURCES = $(top_srcdir)/.version
EXTRA_DIST = \
.version \
-contrib/osmo-bsc-nat.spec.in \
debian \
git-version-gen \
osmoappdesc.py \
diff --git a/configure.ac b/configure.ac
index e3d3aeb..78f96d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,5 +223,4 @@
doc/manuals/Makefile
contrib/Makefile
contrib/systemd/Makefile
-contrib/osmo-bsc-nat.spec
Makefile)
diff --git a/contrib/osmo-bsc-nat.spec.in b/contrib/osmo-bsc-nat.spec.in
deleted file mode 100644
index ed89f27..000
--- a/contrib/osmo-bsc-nat.spec.in
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# spec file for package osmo-bsc-nat
-#
-# Copyright (c) 2017, Martin Hauke
-# Copyright (c) 2021, sysmocom - s.f.m.c. GmbH
-# Author: Oliver Smith
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-## Disable LTO for now since it breaks compilation of the tests
-## https://osmocom.org/issues/4113
-%define _lto_cflags %{nil}
-
-Name: osmo-bsc-nat
-Version:@VERSION@
-Release:0
-Summary:OsmoBSCNAT masquerades multiple BSCs behind one
-License:AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Hardware/Mobile
-URL:https://osmocom.org/projects/osmo-bscnat
-Source: %{name}-%{version}.tar.xz
-BuildRequires: automake >= 1.9
-BuildRequires: libtool >= 2
-BuildRequires: pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: pkgconfig(libcrypto) >= 0.9.5
-BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0
-BuildRequires: pkgconfig(libosmo-sigtran) >= 1.5.0
-BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.9.0
-BuildRequires: pkgconfig(libosmoabis) >= 1.2.0
-BuildRequires: pkgconfig(libosmocore) >= 1.6.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.6.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.6.0
-BuildRequires: pkgconfig(libosmovty) >= 1.6.0
-BuildRequires: pkgconfig(talloc)
-%{?systemd_requires}
-
-%description
-OsmoBSCNAT masquerades multiple BSCs behind one.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
- --docdir=%{_docdir}/%{name} \
- --with-systemdsystemunitdir=%{_unitdir}
-make %{?_smp_mflags}
-
-%install
-%make_install
-
-%if 0%{?suse_version}
-%preun
-%service_del_preun %{name}.service
-
-%postun
-%service_del_postun %{name}.service
-
-%pre
-%service_add_pre %{name}.service
-
-%post
-%service_add_post %{name}.service
-%endif
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%files
-%license COPYING
-%doc AUTHORS README.md
-%{_bindir}/osmo-bsc-nat
-%dir %{_docdir}/%{name}/examples
-%dir %{_docdir}/%{name}/examples/osmo-bsc-nat
-%{_docdir}/%{name}/examples/osmo-bsc-nat/osmo-bsc-nat.cfg
-%dir %{_sysconfdir}/osmocom
-%config(noreplace) %{_sysconfdir}/osmocom/osmo-bsc-nat.cfg
-%{_unitdir}/%{name}.service
-
-%changelog
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/36730?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc-nat
Gerrit-Branch: master
Gerrit-Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9
Gerrit-Change-Number: 36730
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-iuh[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-iuh/+/36741?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: I703e115a426ac1012c80d2e1576ee6dcfbe191a5
---
M Makefile.am
M configure.ac
D contrib/osmo-iuh.spec.in
3 files changed, 11 insertions(+), 182 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index 09afe59..deb57ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@
.version \
README.md \
asn1 \
-contrib/osmo-iuh.spec.in \
debian \
git-version-gen \
$(NULL)
diff --git a/configure.ac b/configure.ac
index e205269..9d7b634 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,5 +153,4 @@
include/osmocom/sabp/Makefile
include/osmocom/iuh/Makefile
doc/Makefile
- contrib/osmo-iuh.spec
)
diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in
deleted file mode 100644
index 3fa80c0..000
--- a/contrib/osmo-iuh.spec.in
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# spec file for package osmo-iuh
-#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2021 sysmocom - s.f.m.c GmbH
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-Name: osmo-iuh
-Version:@VERSION@
-Release:0
-Summary:Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
-License:AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Hardware/Mobile
-URL:https://osmocom.org/projects/osmohnbgw
-Source: %{name}-%{version}.tar.xz
-BuildRequires: automake >= 1.9
-BuildRequires: libtool >= 2
-BuildRequires: lksctp-tools-devel
-BuildRequires: pkgconfig >= 0.20
-# python3 for asn1tostruct.py
-BuildRequires: python3
-BuildRequires: pkgconfig(libasn1c) >= 0.9.30
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires: pkgconfig(libosmogb) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-BuildRequires: pkgconfig(libosmo-netif) >= 1.4.0
-BuildRequires: pkgconfig(libosmo-sigtran) >= 1.8.0
-
-%description
-Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
-
-%package -n libosmo-hnbap0
-Summary:Shared Library part of libosmo-hnbap
-Group: System/Libraries
-
-%description -n libosmo-hnbap0
-Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
-
-%package -n libosmo-hnbap-devel
-Summary:Development files for Osmocom HNBAP library
-Group: Development/Libraries/C and C++
-Requires: libosmo-hnbap0 = %{version}
-
-%description -n libosmo-hnbap-devel
-Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
-
-%package -n libosmo-ranap7
-Summary:Shared Library part of libosmo-ranap
-Group: System/Libraries
-
-%description -n libosmo-ranap7
-Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
-
-%package -n libosmo-ranap-devel
-Summary:Development files for Osmocom RANAP library
-Group: Development/Libraries/C and C++
-Requires: libosmo-ranap7 = %{version}
-
-%description -n libosmo-ranap-devel
-Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmoranap.
-
-%package -n libosmo-rua0
-Summary:Shared Library part of libosmo-rua
-Group: System/Libraries
-
-%description -n libosmo-rua0
-Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
-
-%package -n libosmo-rua-devel
-Summary:Development files for Osmocom RUA library
-Group: Development/Libraries/C and C++
-Requires: libosmo-rua0 = %{version}
-
-%description -n libosmo-rua-devel
-Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
-
-%package -n libosmo-sabp1
-Summary:Shared Library part of libosmo-sabp
-Group: System/Libraries
-
-%description -n libosmo-sabp1
-Osmocom code for the SABP (service area broadcast protocol) interface
-
-%package -n libosmo-sabp-devel
-Summary:Development files for Osmocom SABP library
-Group: Development/Libraries/C and C++
[M] Change in osmo-hnbgw[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36739?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Idd67d52ca736c4e145387ea8d4030f9cf4b9596d
---
M Makefile.am
M configure.ac
D contrib/osmo-hnbgw.spec.in
3 files changed, 11 insertions(+), 119 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index e3176be..2168ff0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@
BUILT_SOURCES = $(top_srcdir)/.version
EXTRA_DIST = \
.version \
-contrib/osmo-hnbgw.spec.in \
debian \
git-version-gen \
osmoappdesc.py \
diff --git a/configure.ac b/configure.ac
index bb8d29e..d98df92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,5 +236,4 @@
doc/charts/Makefile
contrib/Makefile
contrib/systemd/Makefile
-contrib/osmo-hnbgw.spec
Makefile)
diff --git a/contrib/osmo-hnbgw.spec.in b/contrib/osmo-hnbgw.spec.in
deleted file mode 100644
index 414a4d5..000
--- a/contrib/osmo-hnbgw.spec.in
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# spec file for package osmo-hnbgw
-#
-# Copyright (c) 2017, Martin Hauke
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-## Disable LTO for now since it breaks compilation of the tests
-## https://osmocom.org/issues/4113
-%define _lto_cflags %{nil}
-
-Name: osmo-hnbgw
-Version:@VERSION@
-Release:0
-Summary:OsmoHNBGW: Osmocom's Base Station Controller for 2G CS mobile
networks
-License:AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Hardware/Mobile
-URL:https://osmocom.org/projects/osmohnbgw
-Source: %{name}-%{version}.tar.xz
-BuildRequires: automake >= 1.9
-BuildRequires: libtool >= 2
-BuildRequires: lksctp-tools-devel
-BuildRequires: pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: pkgconfig(libcrypto) >= 0.9.5
-BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.12.0
-BuildRequires: pkgconfig(libosmo-netif) >= 1.4.0
-BuildRequires: pkgconfig(libosmo-sigtran) >= 1.8.0
-BuildRequires: pkgconfig(libosmoabis) >= 1.5.0
-BuildRequires: pkgconfig(libosmotrau) >= 1.5.0
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires: pkgconfig(libosmogb) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-BuildRequires: pkgconfig(libosmo-hnbap) >= 1.5.0
-BuildRequires: pkgconfig(libosmo-ranap) >= 1.5.0
-BuildRequires: pkgconfig(libosmo-rua) >= 1.5.0
-BuildRequires: pkgconfig(libosmo-pfcp) >= 0.3.0
-BuildRequires: pkgconfig(talloc)
-BuildRequires: pkgconfig(libasn1c) >= 0.9.30
-%{?systemd_requires}
-
-%description
-OsmoHNBGW: Osmocom's Home NodeB for 3G mobile networks.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
- --docdir=%{_docdir}/%{name} \
- --with-systemdsystemunitdir=%{_unitdir} \
- --enable-pfcp
-make %{?_smp_mflags}
-
-%install
-%make_install
-
-%preun
-%if 0%{?suse_version}
-%service_del_preun %{name}.service
-%endif
-
-%postun
-%if 0%{?suse_version}
-%service_del_postun %{name}.service
-%endif
-
-%pre
-getent group osmocom >/dev/null || groupadd --system osmocom
-getent passwd osmocom >/dev/null || useradd --system --gid osmocom --home-dir
/var/lib/osmocom \
---shell /sbin/nologin --comment
"Open Source Mobile Communications" osmocom
-%if 0%{?suse_version}
-%service_add_pre %{name}.service
-%endif
-
-%post
-%if 0%{?suse_version}
-%service_add_post %{name}.service
-%endif
-chown osmocom:osmocom /etc/osmocom/osmo-hnbgw.cfg
-chmod 0660 /etc/osmocom/osmo-hnbgw.cfg
-chown root:osmocom /etc/osmocom
-chmod 2775 /etc/osmocom
-mkdir -p /var/lib/osmocom
-chown -R osmocom:osmocom /var/lib/osmocom
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%files
-%license COPYING
-%doc AUTHORS README.md
-%{_bindir}/osmo-hnbgw
-%dir %{_docdir}/%{name}/examples
-%dir %{_docdir}/%{name}/examples/osmo-hnbgw
-%{_docdir}/%{name}/examples/osmo-hnbgw/osmo-hnbgw.cfg
[M] Change in osmo-mgw[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/36742?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: I703e115a426ac1012c80d2e1576ee6dcfbe191a5
---
M Makefile.am
M configure.ac
D contrib/osmo-mgw.spec.in
3 files changed, 11 insertions(+), 124 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index 045e74d..a49393c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@
EXTRA_DIST = \
.version \
README.md \
-contrib/osmo-mgw.spec.in \
debian \
git-version-gen \
osmoappdesc.py \
diff --git a/configure.ac b/configure.ac
index 7c56e65..2c4974b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,5 +204,4 @@
doc/manuals/Makefile
contrib/Makefile
contrib/systemd/Makefile
-contrib/osmo-mgw.spec
Makefile)
diff --git a/contrib/osmo-mgw.spec.in b/contrib/osmo-mgw.spec.in
deleted file mode 100644
index a7963a3..000
--- a/contrib/osmo-mgw.spec.in
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# spec file for package osmo-mgw
-#
-# Copyright (c) 2017, Martin Hauke
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-Name: osmo-mgw
-Version:@VERSION@
-Release:0
-Summary:Osmocom's Media Gateway for 2G and 3G circuit-switched mobile
networks
-License:AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Hardware/Mobile
-URL:https://osmocom.org/projects/osmo-mgw
-Source: %{name}-%{version}.tar.xz
-BuildRequires: automake >= 1.9
-BuildRequires: libtool >= 2
-BuildRequires: pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: pkgconfig(libosmo-netif) >= 1.4.0
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-BuildRequires: pkgconfig(libosmocoding) >= 1.9.0
-BuildRequires: pkgconfig(libosmoabis) >= 1.5.0
-BuildRequires: pkgconfig(libosmotrau) >= 1.5.0
-%{?systemd_requires}
-
-%description
-OsmoMGW is Osmocom's Media Gateway for 2G and 3G circuit-switched mobile
networks.
-
-%package -n libosmo-mgcp-client12
-Summary:Osmocom's Media Gateway Control Protocol client library
-Group: System/Libraries
-
-%description -n libosmo-mgcp-client12
-Osmocom's Media Gateway Control Protocol client library.
-
-%package -n libosmo-mgcp-client-devel
-Summary:Development files for Osmocom's Media Gateway Control Protocol
client library
-Group: Development/Libraries/C and C++
-Requires: libosmo-mgcp-client12 = %{version}
-
-%description -n libosmo-mgcp-client-devel
-Osmocom's Media Gateway Control Protocol client librarary.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmo-mgcp-client.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
- --disable-static \
- --docdir=%{_docdir}/%{name} \
- --with-systemdsystemunitdir=%{_unitdir}
-
-make %{?_smp_mflags}
-
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%post -n libosmo-mgcp-client12 -p /sbin/ldconfig
-%postun -n libosmo-mgcp-client12 -p /sbin/ldconfig
-
-%if 0%{?suse_version}
-%preun
-%service_del_preun osmo-mgw.service
-
-%postun
-%service_del_postun osmo-mgw.service
-
-%pre
-%service_add_pre osmo-mgw.service
-
-%post
-%service_add_post osmo-mgw.service
-%endif
-
-%files
-%license COPYING
-%doc AUTHORS README.md
-%dir %{_docdir}/%{name}/examples
-%dir %{_docdir}/%{name}/examples/osmo-mgw
-%{_docdir}/%{name}/examples/osmo-mgw/osmo-mgw.cfg
-%{_docdir}/%{name}/examples/osmo-mgw/osmo-mgw-abis_e1.cfg
-%{_bindir}/osmo-mgw
-%{_unitdir}/osmo-mgw.service
-%dir %{_sysconfdir}/osmocom
-%config(noreplace) %{_sysconfdir}/osmocom/osmo-mgw.cfg
-
-%files -n libosmo-mgcp-client12
-%{_libdir}/libosmo-mgcp-client.so.12*
-
-%files -n libosmo-mgcp-client-devel
[L] Change in osmo-trx[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/36749?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: I0cc8d753b26648efa7c9fb5798f7c4227c328547
---
M Makefile.am
M configure.ac
D contrib/osmo-trx.spec.in
3 files changed, 11 insertions(+), 257 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Makefile.am b/Makefile.am
index aee0d9d..33d8bfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,6 @@
LEGAL \
COPYING \
README.md \
- contrib/osmo-trx.spec.in \
debian \
git-version-gen \
$(NULL)
diff --git a/configure.ac b/configure.ac
index 8aecb27..e3a81f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,7 +240,6 @@
AM_CONDITIONAL(HAVE_SSE4_1, false)
])
-dnl Check if the compiler supports specified GCC's built-in function
AC_DEFUN([CHECK_BUILTIN_SUPPORT], [
AC_CACHE_CHECK(
[whether ${CC} has $1 built-in],
@@ -380,6 +379,5 @@
contrib/Makefile \
contrib/systemd/Makefile \
doc/manuals/Makefile \
-contrib/osmo-trx.spec \
])
AC_OUTPUT
diff --git a/contrib/osmo-trx.spec.in b/contrib/osmo-trx.spec.in
deleted file mode 100644
index 5243d63..000
--- a/contrib/osmo-trx.spec.in
+++ /dev/null
@@ -1,254 +0,0 @@
-#
-# spec file for package osmo-trx
-#
-# Copyright (c) 2017, Martin Hauke
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-Name: osmo-trx
-Version:@VERSION@
-Release:0
-Summary:SDR transceiver that implements Layer 1 of a GSM BTS
-License:AGPL-3.0-or-later
-Group: Productivity/Telephony/Servers
-URL:https://osmocom.org/projects/osmotrx
-Source: %{name}-%{version}.tar.xz
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: fdupes
-BuildRequires: gcc-c++
-BuildRequires: libtool
-BuildRequires: pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-%if ! 0%{?centos_ver}
-BuildRequires: pkgconfig(LimeSuite)
-BuildRequires: pkgconfig(usrp) >= 3.3
-%endif
-BuildRequires: pkgconfig(fftw3f)
-BuildRequires: pkgconfig(libosmocoding) >= 1.9.0
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-BuildRequires: pkgconfig(libusb-1.0)
-BuildRequires: pkgconfig(uhd)
-%{?systemd_requires}
-%if 0%{?suse_version} > 1325
-BuildRequires: libboost_program_options-devel
-BuildRequires: libboost_system-devel
-BuildRequires: libboost_test-devel
-BuildRequires: libboost_thread-devel
-%else
-BuildRequires: boost-devel
-%endif
-
-%description
-OsmoTRX is a software-defined radio transceiver that implements the Layer 1
-physical layer of a BTS comprising the following 3GPP specifications:
-
-TS 05.01 "Physical layer on the radio path"
-TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
-TS 05.04 "Modulation"
-TS 05.10 "Radio subsystem synchronization"
-
-In this context, BTS is "Base transceiver station". It's the stations that
-connect mobile phones to the mobile network.
-
-3GPP is the "3rd Generation Partnership Project" which is the collaboration
-between different telecommunication associations for developing new
-generations of mobile phone networks. (post-2G/GSM)
-
-%package uhd
-Summary:SDR transceiver that implements Layer 1 of a GSM BTS (UHD)
-Group: Productivity/Telephony/Servers
-Requires: uhd-firmware
-
-%description uhd
-OsmoTRX is a software-defined radio transceiver that implements the Layer 1
-physical layer of a BTS comprising the following 3GPP specifications:
-
-TS 05.01 "Physical layer on the radio path"
-TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
-TS 05.04 "Modulation"
-TS 05.10 "Radio subsystem synchronization"
-
-In this context, BTS is "Base transceiver station". It's the stations that
-connect mobile phones to the mobile network.
-
-3GPP is the "3rd Generation Partnership Project" which is the collaboration
-between different telecommunication associations for developing new
-generations of mobile phone networks. (post-2G/GSM)
-
-%if ! 0%{?centos_ver}
-%package usrp1
-Summary:SDR transceiver that implements
[M] Change in osmo-sgsn[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/36746?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: I9e7a3beb861faab1b6852aa5b57847c590986976
---
M Makefile.am
M configure.ac
D contrib/osmo-sgsn.spec.in
3 files changed, 11 insertions(+), 140 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
diff --git a/Makefile.am b/Makefile.am
index b70eb4b..fab0291 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@
EXTRA_DIST = \
.version \
README.md \
-contrib/osmo-sgsn.spec.in \
debian \
git-version-gen \
osmoappdesc.py \
diff --git a/configure.ac b/configure.ac
index ddd91ab..399b466 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,5 +255,4 @@
doc/manuals/Makefile
contrib/Makefile
contrib/systemd/Makefile
-contrib/osmo-sgsn.spec
Makefile)
diff --git a/contrib/osmo-sgsn.spec.in b/contrib/osmo-sgsn.spec.in
deleted file mode 100644
index b0fae9e..000
--- a/contrib/osmo-sgsn.spec.in
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# spec file for package osmo-sgsn
-#
-# Copyright (c) 2017, Martin Hauke
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-## Disable LTO for now since it breaks compilation of the tests
-## https://osmocom.org/issues/4116
-%define _lto_cflags %{nil}
-
-%define with_iu 1
-Name: osmo-sgsn
-Version:@VERSION@
-Release:0
-Summary:Osmocom's SGSN for 2G and 3G packet-switched mobile networks
-License:AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Productivity/Telephony/Servers
-URL:https://osmocom.org/projects/osmosgsn
-Source: %{name}-%{version}.tar.xz
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: pkgconfig
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: pkgconfig(libcares)
-BuildRequires: pkgconfig(libcrypto) >= 0.9.5
-BuildRequires: pkgconfig(libgtp) >= 1.11.0
-BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.7.0
-BuildRequires: pkgconfig(libosmo-netif) >= 1.4.0
-BuildRequires: pkgconfig(libosmoabis) >= 1.5.0
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires: pkgconfig(libosmogb) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-%{?systemd_requires}
-%if %{with_iu}
-BuildRequires: pkgconfig(libasn1c)
-BuildRequires: pkgconfig(libosmo-ranap) >= 1.5.0
-BuildRequires: pkgconfig(libosmo-sigtran) >= 1.8.0
-%endif
-
-%description
-OsmoSGSN is Osmocom's Serving GPRS Support Node for 2G and 3G
-packet-switched mobile networks.
-
-%package -n osmo-gtphub
-Summary:Osmocom GTP Hub: Proxy for GTP traffic between multiple SGSNs
and GGSNs
-Group: Productivity/Telephony/Servers
-
-%description -n osmo-gtphub
-Osmocom GTP Hub: Proxy for GTP traffic between multiple SGSNs and GGSNs.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
-%if %{with_iu}
- --enable-iu \
-%endif
- --docdir=%{_docdir}/%{name} \
- --with-systemdsystemunitdir=%{_unitdir}
-make %{?_smp_mflags}
-
-%install
-%make_install
-
-%if 0%{?suse_version}
-%preun %service_del_preun %{name}.service
-%postun %service_del_postun %{name}.service
-%endif
-
-%pre
-getent group osmocom >/dev/null || groupadd --system osmocom
-getent passwd osmocom >/dev/null || useradd --system --gid osmocom --home-dir
/var/lib/osmocom \
---shell /sbin/nologin --comment
"Open Source Mobile Communications" osmocom
-%if 0%{?suse_version}
-%service_add_pre%{name}.service
-%endif
-
-%post
-%if 0%{?suse_version}
-%service_add_post %{name}.service
-%endif
-chown osmocom:osmocom /etc/osmocom/osmo-sgsn.cfg
-chmod 0660 /etc/osmocom/osmo-sgsn.cfg
-chown root:osmocom /etc/osmocom
-chmod 2775 /etc/osmocom
-mkdir -p /var/lib/osmocom
-chown -R osmocom:osmocom /var/lib/osmocom
-
-%if 0%{?suse_version}
-%preun -n osmo-gtphub %service_del_preun osmo-gtphub.service
-%postun -n osmo-gtphub %service_del_postun osmo-gtphub.service
-%pre-n osmo-gtphub %service_add_pre
[M] Change in osmo-sgsn[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36746?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36746?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9e7a3beb861faab1b6852aa5b57847c590986976 Gerrit-Change-Number: 36746 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:39:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-upf[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-upf/+/36751?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: I0cc8d753b26648efa7c9fb5798f7c4227c328547
---
M Makefile.am
D contrib/osmo-upf.spec.in
2 files changed, 11 insertions(+), 108 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Makefile.am b/Makefile.am
index 4452f04..2168ff0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@
BUILT_SOURCES = $(top_srcdir)/.version
EXTRA_DIST = \
.version \
-contrib/osmo-upf.spec.in \
debian \
git-version-gen \
osmoappdesc.py \
diff --git a/contrib/osmo-upf.spec.in b/contrib/osmo-upf.spec.in
deleted file mode 100644
index bc6c5ed..000
--- a/contrib/osmo-upf.spec.in
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# spec file for package osmo-upf
-#
-# Copyright (c) 2017, Martin Hauke
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-## Disable LTO for now since it breaks compilation of the tests
-## https://osmocom.org/issues/4113
-%define _lto_cflags %{nil}
-
-Name: osmo-upf
-Version:@VERSION@
-Release:0
-Summary:OsmoUPF: Osmocom User Plane Function
-License:AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Hardware/Mobile
-URL:https://osmocom.org/projects/osmo-upf
-Source: %{name}-%{version}.tar.xz
-BuildRequires: autoconf-archive
-BuildRequires: automake >= 1.9
-BuildRequires: libtool >= 2
-BuildRequires: lksctp-tools-devel
-BuildRequires: pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: pkgconfig(libgtpnl) >= 1.2.0
-BuildRequires: pkgconfig(libnftables) >= 1.0.2
-BuildRequires: pkgconfig(libosmocore) >= 1.6.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.6.0
-BuildRequires: pkgconfig(libosmovty) >= 1.6.0
-BuildRequires: pkgconfig(libosmo-pfcp) >= 0.1.0
-BuildRequires: pkgconfig(talloc)
-%{?systemd_requires}
-
-%description
-OsmoUPF: Osmocom User Plane Function
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
- --docdir=%{_docdir}/%{name} \
- --with-systemdsystemunitdir=%{_unitdir}
-make %{?_smp_mflags}
-
-%install
-%make_install
-
-%preun
-%if 0%{?suse_version}
-%service_del_preun %{name}.service
-%endif
-
-%postun
-%if 0%{?suse_version}
-%service_del_postun %{name}.service
-%endif
-
-%pre
-getent group osmocom >/dev/null || groupadd --system osmocom
-getent passwd osmocom >/dev/null || useradd --system --gid osmocom --home-dir
/var/lib/osmocom \
---shell /sbin/nologin --comment
"Open Source Mobile Communications" osmocom
-%if 0%{?suse_version}
-%service_add_pre %{name}.service
-%endif
-
-%post
-%if 0%{?suse_version}
-%service_add_post %{name}.service
-%endif
-chown osmocom:osmocom /etc/osmocom/osmo-upf.cfg
-chmod 0660 /etc/osmocom/osmo-upf.cfg
-chown root:osmocom /etc/osmocom
-chmod 2775 /etc/osmocom
-mkdir -p /var/lib/osmocom
-chown -R osmocom:osmocom /var/lib/osmocom
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%files
-%license COPYING
-%doc AUTHORS README.md
-%{_bindir}/osmo-upf
-%{_bindir}/osmo-pfcp-tool
-%dir %{_docdir}/%{name}/examples
-%dir %{_docdir}/%{name}/examples/osmo-upf
-%{_docdir}/%{name}/examples/osmo-upf/osmo-upf.cfg
-%{_docdir}/%{name}/examples/osmo-upf/osmo-upf-create-dev.cfg
-%{_docdir}/%{name}/examples/osmo-upf/osmo-upf-mockup.cfg
-%dir %{_sysconfdir}/osmocom
-%config(noreplace) %{_sysconfdir}/osmocom/osmo-upf.cfg
-%{_unitdir}/%{name}.service
-
-%changelog
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36751?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I0cc8d753b26648efa7c9fb5798f7c4227c328547
Gerrit-Change-Number: 36751
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[L] Change in osmo-trx[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36749?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36749?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0cc8d753b26648efa7c9fb5798f7c4227c328547 Gerrit-Change-Number: 36749 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:37:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-upf[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/36751?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36751?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I0cc8d753b26648efa7c9fb5798f7c4227c328547 Gerrit-Change-Number: 36751 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:37:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36742?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36742?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I703e115a426ac1012c80d2e1576ee6dcfbe191a5 Gerrit-Change-Number: 36742 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:37:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36739?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Idd67d52ca736c4e145387ea8d4030f9cf4b9596d Gerrit-Change-Number: 36739 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:37:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-iuh[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36741?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36741?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I703e115a426ac1012c80d2e1576ee6dcfbe191a5 Gerrit-Change-Number: 36741 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:37:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc-nat[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/36730?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/36730?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9 Gerrit-Change-Number: 36730 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:37:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-gbproxy[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/36736?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/36736?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I7cfe55fa2fda43da4eaa1e1b8d40b31d1c8aaf30 Gerrit-Change-Number: 36736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:37:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36732?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36732?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic79cde09bf7d5e96e439b1883d3a3fe5568bdbf1 Gerrit-Change-Number: 36732 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:36:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36731?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36731?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic79cde09bf7d5e96e439b1883d3a3fe5568bdbf1 Gerrit-Change-Number: 36731 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:36:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-pfcp[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/36726?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/36726?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36726 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:36:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in gapk[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/36720?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/36720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I320f56a3d60143c0da1b7d8dc8e206f0d5b0210e Gerrit-Change-Number: 36720 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:36:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libsmpp34[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/36728?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/36728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9 Gerrit-Change-Number: 36728 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:36:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-gprs[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/36724?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/36724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36724 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:35:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hlr[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/36738?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/36738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Idd67d52ca736c4e145387ea8d4030f9cf4b9596d Gerrit-Change-Number: 36738 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:35:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ggsn[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36737?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36737?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7cfe55fa2fda43da4eaa1e1b8d40b31d1c8aaf30 Gerrit-Change-Number: 36737 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 13 May 2024 08:35:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: contrib/systemd: run as osmocom user
Attention is currently required from: fixeria, lynxis lazus, msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email ) Change subject: contrib/systemd: run as osmocom user .. Patch Set 8: (1 comment) File debian/postinst: https://gerrit.osmocom.org/c/osmo-mgw/+/30094/comment/8715b23e_86e4d5ee PS8, Line 18: # Fix permissions of previous (root-owned) install (OS#4107) Please note that changing the user the Osmocom programs run as, from root to the new osmocom user, is a lot of effort. It affects lots of repositories, and I'm trying to do it consistently across all of them. So if we make such a change here, we would also need to do it with the other repositories (and for many the related changes were already merged: https://gerrit.osmocom.org/q/topic:nonroot+is:merged). The issue has also been open for 5 years at this point with previous attempts stuck as in WIP due the scope of having to adjust all repositories (and making sure it doesn't affect OE, ...), and I would be happy to have it finished up: https://osmocom.org/issues/4107 With that being said: > It would be great to show a warning or something, so the user know those file > has been changed. One way to do it without introducing additional complexity could be `chown -v`, and `chmod -v`. But that also causes a line to be printed if the permissions do not change. ``` # chown -v osmocom:osmocom /etc/osmocom/osmo-mgw.cfg changed ownership of '/etc/osmocom/osmo-mgw.cfg' from root:root to osmocom:osmocom # chown -v osmocom:osmocom /etc/osmocom/osmo-mgw.cfg ownership of '/etc/osmocom/osmo-mgw.cfg' retained as osmocom:osmocom # chmod -v 0660 /etc/osmocom/osmo-mgw.cfg mode of '/etc/osmocom/osmo-mgw.cfg' retained as 0660 (rw-rw) ``` > Can't you detect if this is an upgrade and from which version you're > upgrading from? This doesn't really work for the nightly packages, and it would also mean that we need to hardcode the version that introduces this change for every repository into this postinst file. I'd rather avoid this effort, as mentioned this is already a big undertaking. Additionally, the more logic we put into such postinst files, the more likeyl they are to have bugs... IMHO it's better to just run this unconditionally, if we have to do this (and we do, because otherwise we break the feature that allows writing back config files). Since similar patches were already +2'd and merged, I suggest we do it the same way here. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb83c231231b39dc6732c0f375aeb3b21f3938ef Gerrit-Change-Number: 30094 Gerrit-PatchSet: 8 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: fixeria Gerrit-Attention: lynxis lazus Gerrit-Attention: msuraev Gerrit-Comment-Date: Mon, 13 May 2024 07:54:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment
[S] Change in ...osmo_dia2gsup[master]: debian/postinst: chmod +x
osmith has submitted this change. (
https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36773?usp=email )
Change subject: debian/postinst: chmod +x
..
debian/postinst: chmod +x
Fixes: 240b43f3 ("contrib/systemd: run as osmocom user")
Change-Id: I281d55eaa9e058018604544599e80e60fb0aca79
---
M debian/postinst
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/debian/postinst b/debian/postinst
old mode 100644
new mode 100755
--
To view, visit
https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36773?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo_dia2gsup
Gerrit-Branch: master
Gerrit-Change-Id: I281d55eaa9e058018604544599e80e60fb0aca79
Gerrit-Change-Number: 36773
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in ...osmo_dia2gsup[master]: debian/postinst: chmod +x
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36773?usp=email ) Change subject: debian/postinst: chmod +x .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: trivial fixup -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36773?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I281d55eaa9e058018604544599e80e60fb0aca79 Gerrit-Change-Number: 36773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 13 May 2024 06:41:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36725?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc
---
M Makefile.am
M configure.ac
D contrib/libosmo-netif.spec.in
3 files changed, 12 insertions(+), 87 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Makefile.am b/Makefile.am
index f50cd0f..fd03b74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@
EXTRA_DIST = \
.version \
README.md \
-contrib/libosmo-netif.spec.in \
debian \
git-version-gen \
$(NULL)
diff --git a/configure.ac b/configure.ac
index 6b4c2be..8016bdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,5 +148,4 @@
utils/Makefile
tests/Makefile
Doxyfile
- Makefile
- contrib/libosmo-netif.spec)
+ Makefile)
diff --git a/contrib/libosmo-netif.spec.in b/contrib/libosmo-netif.spec.in
deleted file mode 100644
index 4ac1302..000
--- a/contrib/libosmo-netif.spec.in
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# spec file for package libosmo-netif
-#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-Name: libosmo-netif
-Version:@VERSION@
-Release:0
-Summary:Osmocom library for muxed audio
-License:GPL-2.0-or-later
-Group: Productivity/Telephony/Utilities
-URL:https://osmocom.org/projects/libosmo-netif
-Source: %{name}-%{version}.tar.xz
-BuildRequires: automake
-BuildRequires: libtool >= 2
-BuildRequires: lksctp-tools-devel
-BuildRequires: pkgconfig >= 0.20
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmocodec) >= 1.9.0
-
-%description
-Network interface demuxer library for OsmoCom projects.
-
-%package -n libosmonetif11
-Summary:Osmocom library for muxed audio
-License:AGPL-3.0-or-later
-Group: System/Libraries
-
-%description -n libosmonetif11
-Network interface demuxer library for OsmoCom projects.
-
-%package -n libosmonetif-devel
-Summary:Development files for the Osmocom muxed audio library
-License:AGPL-3.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmonetif11 = %{version}
-
-%description -n libosmonetif-devel
-Network interface demuxer library for OsmoCom projects.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmo-netif.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fiv
-%configure --enable-shared --disable-static
--includedir="%{_includedir}/%{name}"
-make %{?_smp_mflags}
-
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%post -n libosmonetif11 -p /sbin/ldconfig
-%postun -n libosmonetif11 -p /sbin/ldconfig
-
-%files -n libosmonetif11
-%{_libdir}/libosmonetif.so.11*
-
-%files -n libosmonetif-devel
-%license COPYING
-%dir %{_includedir}/%{name}
-%dir %{_includedir}/%{name}/osmocom
-%{_includedir}/%{name}/osmocom/netif/
-%{_libdir}/libosmonetif.so
-%{_libdir}/pkgconfig/libosmo-netif.pc
-
-%changelog
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36725?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc
Gerrit-Change-Number: 36725
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in libosmo-sccp[master]: contrib: remove rpm spec file
osmith has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36727?usp=email )
Change subject: contrib: remove rpm spec file
..
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc
---
M Makefile.am
M configure.ac
D contrib/libosmo-sccp.spec.in
3 files changed, 11 insertions(+), 206 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Makefile.am b/Makefile.am
index bece371..5a2cad4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@
EXTRA_DIST = \
.version \
README.md \
-contrib/libosmo-sccp.spec.in \
debian \
git-version-gen \
osmoappdesc.py \
diff --git a/configure.ac b/configure.ac
index 322a57a..115fe67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,6 +206,5 @@
doc/manuals/Makefile
contrib/Makefile
contrib/systemd/Makefile
-contrib/libosmo-sccp.spec
Doxyfile
Makefile)
diff --git a/contrib/libosmo-sccp.spec.in b/contrib/libosmo-sccp.spec.in
deleted file mode 100644
index 9d70874..000
--- a/contrib/libosmo-sccp.spec.in
+++ /dev/null
@@ -1,204 +0,0 @@
-#
-# spec file for package libosmo-sccp
-#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Avoid "E: lto-no-text-in-archive"
-# https://en.opensuse.org/openSUSE:LTO#Static_libraries
-%if 0%{?suse_version}
-%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
-%endif
-
-Name: libosmo-sccp
-Version:@VERSION@
-Release:0
-Summary:Osmocom library for the A-bis interface between BTS and BSC
-License:AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Hardware/Mobile
-URL:https://osmocom.org/projects/libosmo-sccp
-Source: %{name}-%{version}.tar.xz
-BuildRequires: automake >= 1.6
-BuildRequires: libtool >= 2
-BuildRequires: lksctp-tools-devel
-BuildRequires: pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires: systemd-rpm-macros
-%endif
-BuildRequires: xz
-BuildRequires: pkgconfig(libosmo-netif) >= 1.4.0
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-%{?systemd_requires}
-
-%description
-SCCP is a network layer protocol that provides extended routing, flow
-control, segmentation, connection-orientation, and error correction
-facilities in Signaling System 7 telecommunications networks. SCCP is
-heavily used in cellular networks such as GSM.
-
-%package -n libosmo-mtp-devel
-Summary:Development files for the Osmocom MTP library
-License:GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-
-%description -n libosmo-mtp-devel
-MTP is part of SS7 used for communication in Public Switched
-Telephone Networks.
-
-This subpackage contains the development files for the Osmocom MTP
-library.
-
-%package -n libosmo-sccp-devel
-Summary:Development files for the Osmocom SCCP library
-License:GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-
-%description -n libosmo-sccp-devel
-SCCP is a network layer protocol that provides routing, flow control,
-segmentation, connection-orientation, and error correction facilities
-in SS7 telecommunications networks.
-
-This subpackage contains the development files for the Osmocom SCCP
-library.
-
-%package -n libosmo-sigtran9
-Summary:Osmocom SIGTRAN library
-License:GPL-2.0-or-later
-Group: System/Libraries
-
-%description -n libosmo-sigtran9
-Osmocom implementation of (parts of) SIGTRAN.
-
-%package -n libosmo-sigtran-devel
-Summary:Development files for the Osmocom sigtran library
-License:GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmo-sigtran9 = %{version}
-
-%description -n libosmo-sigtran-devel
-Osmocom implementation of (parts of) SIGTRAN.
-
-This subpackage contains the development files for the Osmocom
-SIGTRAN library.
-
-%package -n libosmo-xua-devel
-Summary:Development files for the Osmocom M2UA library
-License:GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmo-sigtran-devel =
