Skip to content

Commit

Permalink
Merge branch 'dev' into 'master'
Browse files Browse the repository at this point in the history 
Fix SCPC

See merge request opensand/opensand!20
  • Loading branch information
Ettinger Mathias committed Mar 13, 2023
2 parents cd98d45 + d50058f commit ffda4b2
Show file tree
Hide file tree
Showing 22 changed files with 126 additions and 2 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions opensand-core/src/dvb/core/SpotDownward.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/focal/opensand-collector/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-collector (6.1.1) focal; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-collector (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/focal/opensand-conf/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-conf (6.1.1) focal; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-conf (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/focal/opensand-core/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-core (6.1.1) focal; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-core (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/focal/opensand-deploy/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-deploy (6.1.1) focal; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-deploy (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/focal/opensand-meta/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-meta (6.1.1) focal; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-meta (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/focal/opensand-network/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-network (6.1.1) focal; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-network (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/focal/opensand-output/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-output (6.1.1) focal; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-output (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/focal/opensand-plugins/encapsulation/gse/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-gse-encap-plugin (6.1.1) focal; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-gse-encap-plugin (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/focal/opensand-plugins/encapsulation/rle/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-rle-encap-plugin (6.1.1) focal; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-rle-encap-plugin (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/focal/opensand-rt/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-rt (6.1.1) focal; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-rt (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/jellyfish/opensand-collector/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-collector (6.1.1) jammy; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-collector (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/jellyfish/opensand-conf/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-conf (6.1.1) jammy; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-conf (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/jellyfish/opensand-core/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-core (6.1.1) jammy; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-core (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/jellyfish/opensand-deploy/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-deploy (6.1.1) jammy; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-deploy (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/jellyfish/opensand-meta/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-meta (6.1.1) jammy; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-meta (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/jellyfish/opensand-network/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-network (6.1.1) jammy; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-network (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/jellyfish/opensand-output/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-output (6.1.1) jammy; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-output (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/jellyfish/opensand-plugins/encapsulation/gse/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-gse-encap-plugin (6.1.1) jammy; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-gse-encap-plugin (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/jellyfish/opensand-plugins/encapsulation/rle/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-rle-encap-plugin (6.1.1) jammy; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-rle-encap-plugin (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down
6 changes: 6 additions & 0 deletions opensand-packaging/jellyfish/opensand-rt/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opensand-rt (6.1.1) jammy; urgency=low

* Release 6.1.1

-- mettinger <[email protected]> Mon, 13 Mar 2023 11:35:10 +0100

opensand-rt (6.1.0) xenial; urgency=low

* Release 6.1.0
Expand Down

0 comments on commit ffda4b2

Please sign in to comment.