Projects
osmocom:master
osmo-pcu
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 154
View file
commit_4b5a92196db31150ca0f3c0c1ec8fb07e45ecf10.txt
Deleted
View file
commit_8734f1765ddcae61ebb0aa8fc0f8abdba875c669.txt
Added
View file
osmo-pcu_1.5.0.3.4b5a.dsc -> osmo-pcu_1.5.0.4.8734.dsc
Changed
@@ -2,7 +2,7 @@ Source: osmo-pcu Binary: osmo-pcu, osmo-pcu-dbg, osmo-pcu-doc Architecture: any all -Version: 1.5.0.3.4b5a +Version: 1.5.0.4.8734 Maintainer: Osmocom team <openbsc@lists.osmocom.org> Homepage: http://osmocom.org/projects/osmopcu Standards-Version: 3.9.8 @@ -14,8 +14,8 @@ osmo-pcu-dbg deb debug extra arch=any osmo-pcu-doc deb doc optional arch=all Checksums-Sha1: - 88f09c0a3e087bf7a9ce4cdc34357bc9174f0b6e 433368 osmo-pcu_1.5.0.3.4b5a.tar.xz + 42848fe33bafac2f113a4c33b407a42d9a0d19d7 434048 osmo-pcu_1.5.0.4.8734.tar.xz Checksums-Sha256: - 490fdc62a4a427f2fc05c73bed50a524943922bf168dc95b7e797e566b6ee5e0 433368 osmo-pcu_1.5.0.3.4b5a.tar.xz + b04b15e9bc5e4cc9982da7a4ab52a00d099296bb0fdb6a6b35546b2aa490efe2 434048 osmo-pcu_1.5.0.4.8734.tar.xz Files: - f9dfaa29dc4b1c7f0b617c5ab75670f4 433368 osmo-pcu_1.5.0.3.4b5a.tar.xz + 78e48c47f98aac4728ccc642695e42a1 434048 osmo-pcu_1.5.0.4.8734.tar.xz
View file
osmo-pcu_1.5.0.3.4b5a.tar.xz/.tarball-version -> osmo-pcu_1.5.0.4.8734.tar.xz/.tarball-version
Changed
@@ -1 +1 @@ -1.5.0.3-4b5a +1.5.0.4-8734
View file
osmo-pcu_1.5.0.3.4b5a.tar.xz/debian/changelog -> osmo-pcu_1.5.0.4.8734.tar.xz/debian/changelog
Changed
@@ -1,8 +1,8 @@ -osmo-pcu (1.5.0.3.4b5a) unstable; urgency=medium +osmo-pcu (1.5.0.4.8734) unstable; urgency=medium * Automatically generated changelog entry for building the Osmocom master feed - -- Osmocom OBS scripts <info@osmocom.org> Wed, 31 Jul 2024 23:05:36 +0000 + -- Osmocom OBS scripts <info@osmocom.org> Thu, 01 Aug 2024 09:41:53 +0000 osmo-pcu (1.5.0) unstable; urgency=medium
View file
osmo-pcu_1.5.0.3.4b5a.tar.xz/src/tbf_dl_ass_fsm.c -> osmo-pcu_1.5.0.4.8734.tar.xz/src/tbf_dl_ass_fsm.c
Changed
@@ -42,6 +42,7 @@ { TBF_DL_ASS_EV_CREATE_RLCMAC_MSG, "CREATE_RLCMAC_MSG" }, { TBF_DL_ASS_EV_RX_ASS_CTRL_ACK, "RX_ASS_CTRL_ACK" }, { TBF_DL_ASS_EV_ASS_POLL_TIMEOUT, "ASS_POLL_TIMEOUT" }, + { TBF_DL_ASS_EV_ABORT, "ABORT" }, { 0, NULL } }; @@ -163,6 +164,10 @@ return; tbf_dl_ass_fsm_state_chg(fi, TBF_DL_ASS_WAIT_ACK); break; + case TBF_DL_ASS_EV_ABORT: + /* Cancel pending schedule for Pkt Ul Ass: */ + tbf_dl_ass_fsm_state_chg(fi, TBF_DL_ASS_NONE); + break; default: OSMO_ASSERT(0); } @@ -183,6 +188,9 @@ /* Reschedule Pkt Dl Ass */ tbf_dl_ass_fsm_state_chg(fi, TBF_DL_ASS_SEND_ASS); break; + case TBF_DL_ASS_EV_ABORT: + tbf_dl_ass_fsm_state_chg(fi, TBF_DL_ASS_NONE); + break; default: OSMO_ASSERT(0); } @@ -208,7 +216,8 @@ .onenter = st_none_on_enter, }, TBF_DL_ASS_SEND_ASS = { - .in_event_mask = X(TBF_DL_ASS_EV_CREATE_RLCMAC_MSG), + .in_event_mask = X(TBF_DL_ASS_EV_CREATE_RLCMAC_MSG) | + X(TBF_DL_ASS_EV_ABORT), .out_state_mask = X(TBF_DL_ASS_WAIT_ACK) | X(TBF_DL_ASS_NONE), @@ -218,7 +227,8 @@ TBF_DL_ASS_WAIT_ACK = { .in_event_mask = X(TBF_DL_ASS_EV_RX_ASS_CTRL_ACK) | - X(TBF_DL_ASS_EV_ASS_POLL_TIMEOUT), + X(TBF_DL_ASS_EV_ASS_POLL_TIMEOUT) | + X(TBF_DL_ASS_EV_ABORT), .out_state_mask = X(TBF_DL_ASS_NONE) | X(TBF_DL_ASS_SEND_ASS),
View file
osmo-pcu_1.5.0.3.4b5a.tar.xz/src/tbf_dl_ass_fsm.h -> osmo-pcu_1.5.0.4.8734.tar.xz/src/tbf_dl_ass_fsm.h
Changed
@@ -28,6 +28,7 @@ TBF_DL_ASS_EV_CREATE_RLCMAC_MSG, /* Scheduler wants to gen+Tx the Ass (rej): data=tbf_dl_ass_ev_create_rlcmac_msg_ctx */ TBF_DL_ASS_EV_RX_ASS_CTRL_ACK, /* Received CTRL ACK answering poll set on Pkt Dl Ass */ TBF_DL_ASS_EV_ASS_POLL_TIMEOUT, /* Pdch Ul Controller signals timeout for poll set on Pkt Dl Ass */ + TBF_DL_ASS_EV_ABORT, /* DL TBF being assigned was internally released */ }; enum tbf_dl_ass_fsm_states {
View file
osmo-pcu_1.5.0.3.4b5a.tar.xz/src/tbf_dl_fsm.c -> osmo-pcu_1.5.0.4.8734.tar.xz/src/tbf_dl_fsm.c
Changed
@@ -411,6 +411,10 @@ static int tbf_dl_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct tbf_dl_fsm_ctx *ctx = (struct tbf_dl_fsm_ctx *)fi->priv; + struct GprsMs *ms = NULL; + struct gprs_rlcmac_ul_tbf *ul_tbf = NULL; + struct gprs_rlcmac_tbf *tbf = NULL; + switch (fi->T) { case -2002: handle_timeout_X2002(fi); @@ -419,7 +423,14 @@ tbf_dl_fsm_state_chg(fi, TBF_ST_WAIT_REUSE_TFI); break; case -2001: + ms = tbf_ms(ctx->tbf); + ul_tbf = ms_ul_tbf(ms); + tbf = ul_tbf_as_tbf(ul_tbf); LOGPTBFDL(ctx->dl_tbf, LOGL_NOTICE, "releasing due to PACCH assignment timeout.\n"); + /* If a UL TBF is trying to assign us, notify it that we are + * dying so it avoids continuing the assignment. */ + if (ul_tbf && tbf_dl_ass_fi(tbf)->state != TBF_DL_ASS_NONE) + osmo_fsm_inst_dispatch(tbf_dl_ass_fi(tbf), TBF_DL_ASS_EV_ABORT, NULL); /* fall-through */ case 3193: case 3195:
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.