diff --git a/ChangeLog b/ChangeLog index dc86cc3d..7cff8717 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2022-03-13 opensand-6.1.1 + + * Fix SCPC (again) + 2022-12-12 opensand-6.1.0 * Added support for ubuntu 22.04 (jammy) diff --git a/opensand-core/src/dvb/core/SpotDownward.cpp b/opensand-core/src/dvb/core/SpotDownward.cpp index d8a40316..52aec7bc 100644 --- a/opensand-core/src/dvb/core/SpotDownward.cpp +++ b/opensand-core/src/dvb/core/SpotDownward.cpp @@ -1457,8 +1457,6 @@ bool SpotDownward::addCniExt(void) } FifoElement *new_el = new FifoElement(nullptr, 0, 0); - // highest priority fifo - (fifos_it->second)[0]->pushBack(new_el); // set packet extension to this new empty packet if(!this->setPacketExtension(this->pkt_hdl, new_el, @@ -1471,6 +1469,8 @@ bool SpotDownward::addCniExt(void) { return false; } + // highest priority fifo + (fifos_it->second)[0]->pushBack(new_el); LOG(this->log_send_channel, LEVEL_DEBUG, "SF #%d: adding empty packet into FIFO NM\n", diff --git a/opensand-packaging/focal/opensand-collector/debian/changelog b/opensand-packaging/focal/opensand-collector/debian/changelog index 978f2fc3..e37533cc 100644 --- a/opensand-packaging/focal/opensand-collector/debian/changelog +++ b/opensand-packaging/focal/opensand-collector/debian/changelog @@ -1,3 +1,9 @@ +opensand-collector (6.1.1) focal; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-collector (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/focal/opensand-conf/debian/changelog b/opensand-packaging/focal/opensand-conf/debian/changelog index cb1c46d8..5525fb8f 100644 --- a/opensand-packaging/focal/opensand-conf/debian/changelog +++ b/opensand-packaging/focal/opensand-conf/debian/changelog @@ -1,3 +1,9 @@ +opensand-conf (6.1.1) focal; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-conf (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/focal/opensand-core/debian/changelog b/opensand-packaging/focal/opensand-core/debian/changelog index d8c42b6b..f4fe5659 100644 --- a/opensand-packaging/focal/opensand-core/debian/changelog +++ b/opensand-packaging/focal/opensand-core/debian/changelog @@ -1,3 +1,9 @@ +opensand-core (6.1.1) focal; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-core (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/focal/opensand-deploy/debian/changelog b/opensand-packaging/focal/opensand-deploy/debian/changelog index 4dd53f75..bc34c4d9 100644 --- a/opensand-packaging/focal/opensand-deploy/debian/changelog +++ b/opensand-packaging/focal/opensand-deploy/debian/changelog @@ -1,3 +1,9 @@ +opensand-deploy (6.1.1) focal; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-deploy (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/focal/opensand-meta/debian/changelog b/opensand-packaging/focal/opensand-meta/debian/changelog index 33baeed6..31dea7b4 100644 --- a/opensand-packaging/focal/opensand-meta/debian/changelog +++ b/opensand-packaging/focal/opensand-meta/debian/changelog @@ -1,3 +1,9 @@ +opensand-meta (6.1.1) focal; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-meta (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/focal/opensand-network/debian/changelog b/opensand-packaging/focal/opensand-network/debian/changelog index a6d3f975..7978d845 100644 --- a/opensand-packaging/focal/opensand-network/debian/changelog +++ b/opensand-packaging/focal/opensand-network/debian/changelog @@ -1,3 +1,9 @@ +opensand-network (6.1.1) focal; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-network (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/focal/opensand-output/debian/changelog b/opensand-packaging/focal/opensand-output/debian/changelog index 76af7efa..816c21b0 100644 --- a/opensand-packaging/focal/opensand-output/debian/changelog +++ b/opensand-packaging/focal/opensand-output/debian/changelog @@ -1,3 +1,9 @@ +opensand-output (6.1.1) focal; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-output (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/focal/opensand-plugins/encapsulation/gse/debian/changelog b/opensand-packaging/focal/opensand-plugins/encapsulation/gse/debian/changelog index 921adeb5..7501f7ad 100644 --- a/opensand-packaging/focal/opensand-plugins/encapsulation/gse/debian/changelog +++ b/opensand-packaging/focal/opensand-plugins/encapsulation/gse/debian/changelog @@ -1,3 +1,9 @@ +opensand-gse-encap-plugin (6.1.1) focal; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-gse-encap-plugin (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/focal/opensand-plugins/encapsulation/rle/debian/changelog b/opensand-packaging/focal/opensand-plugins/encapsulation/rle/debian/changelog index dbf8866e..aae39d0d 100644 --- a/opensand-packaging/focal/opensand-plugins/encapsulation/rle/debian/changelog +++ b/opensand-packaging/focal/opensand-plugins/encapsulation/rle/debian/changelog @@ -1,3 +1,9 @@ +opensand-rle-encap-plugin (6.1.1) focal; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-rle-encap-plugin (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/focal/opensand-rt/debian/changelog b/opensand-packaging/focal/opensand-rt/debian/changelog index d034cf01..c9ebb6f2 100644 --- a/opensand-packaging/focal/opensand-rt/debian/changelog +++ b/opensand-packaging/focal/opensand-rt/debian/changelog @@ -1,3 +1,9 @@ +opensand-rt (6.1.1) focal; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-rt (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/jellyfish/opensand-collector/debian/changelog b/opensand-packaging/jellyfish/opensand-collector/debian/changelog index 978f2fc3..99faff17 100644 --- a/opensand-packaging/jellyfish/opensand-collector/debian/changelog +++ b/opensand-packaging/jellyfish/opensand-collector/debian/changelog @@ -1,3 +1,9 @@ +opensand-collector (6.1.1) jammy; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-collector (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/jellyfish/opensand-conf/debian/changelog b/opensand-packaging/jellyfish/opensand-conf/debian/changelog index cb1c46d8..247c463b 100644 --- a/opensand-packaging/jellyfish/opensand-conf/debian/changelog +++ b/opensand-packaging/jellyfish/opensand-conf/debian/changelog @@ -1,3 +1,9 @@ +opensand-conf (6.1.1) jammy; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-conf (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/jellyfish/opensand-core/debian/changelog b/opensand-packaging/jellyfish/opensand-core/debian/changelog index d8c42b6b..52c63086 100644 --- a/opensand-packaging/jellyfish/opensand-core/debian/changelog +++ b/opensand-packaging/jellyfish/opensand-core/debian/changelog @@ -1,3 +1,9 @@ +opensand-core (6.1.1) jammy; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-core (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/jellyfish/opensand-deploy/debian/changelog b/opensand-packaging/jellyfish/opensand-deploy/debian/changelog index 4dd53f75..61008ec1 100644 --- a/opensand-packaging/jellyfish/opensand-deploy/debian/changelog +++ b/opensand-packaging/jellyfish/opensand-deploy/debian/changelog @@ -1,3 +1,9 @@ +opensand-deploy (6.1.1) jammy; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-deploy (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/jellyfish/opensand-meta/debian/changelog b/opensand-packaging/jellyfish/opensand-meta/debian/changelog index 33baeed6..70a68751 100644 --- a/opensand-packaging/jellyfish/opensand-meta/debian/changelog +++ b/opensand-packaging/jellyfish/opensand-meta/debian/changelog @@ -1,3 +1,9 @@ +opensand-meta (6.1.1) jammy; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-meta (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/jellyfish/opensand-network/debian/changelog b/opensand-packaging/jellyfish/opensand-network/debian/changelog index a6d3f975..b369e84b 100644 --- a/opensand-packaging/jellyfish/opensand-network/debian/changelog +++ b/opensand-packaging/jellyfish/opensand-network/debian/changelog @@ -1,3 +1,9 @@ +opensand-network (6.1.1) jammy; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-network (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/jellyfish/opensand-output/debian/changelog b/opensand-packaging/jellyfish/opensand-output/debian/changelog index 76af7efa..b190a45e 100644 --- a/opensand-packaging/jellyfish/opensand-output/debian/changelog +++ b/opensand-packaging/jellyfish/opensand-output/debian/changelog @@ -1,3 +1,9 @@ +opensand-output (6.1.1) jammy; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-output (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/jellyfish/opensand-plugins/encapsulation/gse/debian/changelog b/opensand-packaging/jellyfish/opensand-plugins/encapsulation/gse/debian/changelog index 921adeb5..8707acd3 100644 --- a/opensand-packaging/jellyfish/opensand-plugins/encapsulation/gse/debian/changelog +++ b/opensand-packaging/jellyfish/opensand-plugins/encapsulation/gse/debian/changelog @@ -1,3 +1,9 @@ +opensand-gse-encap-plugin (6.1.1) jammy; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-gse-encap-plugin (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/jellyfish/opensand-plugins/encapsulation/rle/debian/changelog b/opensand-packaging/jellyfish/opensand-plugins/encapsulation/rle/debian/changelog index dbf8866e..78f06fd3 100644 --- a/opensand-packaging/jellyfish/opensand-plugins/encapsulation/rle/debian/changelog +++ b/opensand-packaging/jellyfish/opensand-plugins/encapsulation/rle/debian/changelog @@ -1,3 +1,9 @@ +opensand-rle-encap-plugin (6.1.1) jammy; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-rle-encap-plugin (6.1.0) xenial; urgency=low * Release 6.1.0 diff --git a/opensand-packaging/jellyfish/opensand-rt/debian/changelog b/opensand-packaging/jellyfish/opensand-rt/debian/changelog index d034cf01..63dda78f 100644 --- a/opensand-packaging/jellyfish/opensand-rt/debian/changelog +++ b/opensand-packaging/jellyfish/opensand-rt/debian/changelog @@ -1,3 +1,9 @@ +opensand-rt (6.1.1) jammy; urgency=low + + * Release 6.1.1 + + -- mettinger Mon, 13 Mar 2023 11:35:10 +0100 + opensand-rt (6.1.0) xenial; urgency=low * Release 6.1.0