Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synchronize official source code #126

Merged
merged 40 commits into from
Sep 20, 2024
Merged

Synchronize official source code #126

merged 40 commits into from
Sep 20, 2024

Conversation

openwrtdiy
Copy link
Owner

Thanks for your contribution to OpenWrt!

To help keep the codebase consistent and readable,
and to help people review your contribution,
we ask you to follow the rules you find in the wiki at this link
https://openwrt.org/submitting-patches

Please remove this message before posting the pull request.

spflieger and others added 30 commits September 17, 2024 12:36
@spflieger @robimarko
lldpd: add lldp_syscapabilities config option
8f714af 
allow to overwrite the detected system capabilities e.g. if devices
does not operate as bridge.

Signed-off-by: Sebastian Pflieger <sebastian@pflieger.email>
(cherry picked from commit 3ce9099)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: Init config read on reload
b0f991d 
Init script reload with trigger to detect config file update.
Reload command added to attempt non-impactful lldpd reload where
lldpcli can be used to update config without process restart.
Config hash function used to track whether process restart is needed.

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit e483c24)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: LLDPD binds to only specified interfaces
f79ab96 
Bind to the configured system interfaces only. Switchport interfaces
are no longer ignored and uci interface values for LLDPD are honored.

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit 064b499)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: Allow neighbour filtering
1d83e4c 
add filter option to init script.

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit ac3ed75)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: Init adds no-version option
59ad77f 
add option to disable advertising kernel version

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit 058f284)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: option to disable LLDP-MED inventory TLV
15e6259 
add option to disable LLDP-MED inventory TLV transmission

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit 1753498)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: add LLDP MED options
be48249 
add option to enable LLDP MED fast-start and set fast-start timer

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit 24176a6)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: add agent-type option
6cbc100 
add option to set agent-type to control propogation

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit c98ee4d)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: add portidsubtype option
ed3f182 
add option portidsubtype to correct port identifiers and descriptions

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit ac77131)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: allow disabling LLDP protcol
7f58fc1 
add option to allow LLDP disabling while using other supported protocols

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit 61dbe75)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: set CDP version and allow forcing CDP on
d6da095 
add option to specify CDPv1 or CDPv2 and separately enable or force each

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit b671820)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: add option to force FDP on
1201a69 
add option to force FDP when no peers detected

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit 1be2088)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: add option to force SONMP enabled
18fc86a 
add option to force SONMP to be enabled even when no peer detected

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit 4ac134a)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: add option to set system platform
b200840 
add option to override system platform instead of using kernel name

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit 4159acc)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: add option for tx delay and tx hold
a7f749d 
add option to set LLDP transmit delay, hold timers to set update frequency

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit a5f715d)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: Update Makefile package release
02e3845 
increment Makefile package release to reflect changes to init script

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit 1b36d44)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: only use snmp options when compiled in
13193cb 
prevent SNMP options being passed unless lldpd supports them

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit 8b2d02e)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@robimarko
lldpd: add option to force EDP
4ebd60b 
allow EDP support if compiled and add force EDP option

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
(cherry picked from commit d274867)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: fix -k 'lldp_no_version' row
1d14e0a 
Supplementary fix for PR openwrt#14193 and commit
b671820

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 97eb3bf)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: spell fixes
c0217ef 
Supplementary fix for PR openwrt#14193

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 1909b6f)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: fix a paste error
b1ddf0a 
from commit 1be2088

The original PR openwrt#13018 did not exhibit this.

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 4fb8fea)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: remove unneeded quotes and variable quoting
4446346 
from commit 24176a6

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 20a4ddd)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: remove unneeded quotes
50135a0 
from commit 3ce9099

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 82ec853)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: remove unneeded quotes and variable quoting
89759ee 
from commit 3ce9099

'capabilities enabled x' where x is a string of CSV

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit b039641)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: remove unneeded quotes and variable quoting
64b38f3 
from commit c98ee4d

agent-type takes 1 of 3 possible keywords which do not require quoting:

         configure lldp agent-type nearest-bridge | nearest-non-tpmr-bridge
         | nearest-customer-bridge

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 24a4da5)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: remove unneeded quotes and variable quoting
8766fed 
from commit ac77131

portidsubtype takes 1 of 2 possible keywords which do not need quoting:

         configure lldp portidsubtype ifname | macaddress

The third keyword 'local' is used in the syntax when individual ports
are being defined:

         configure [ports ethX [,…]] lldp portidsubtype local value

When this syntax is used, quoting is useful (see test cases for lldpd).
In the init file, the 'local' syntax is unused.

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit bd1b17d)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: remove unneeded quotes
74581b0 
from commit a5f715d

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 4dcece4)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: refactor out ifaces derivation; reuse function
b886948 
from commit 909f063

Now pass two params to get_config_cid_ifaces() for:

cid_interface
interface

Each of which is a CSV of interfaces.

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 228d4e7)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: fix error "sh: XXXms: bad number"
7542e79 
from commit 3ce9099

The lldpd man page says that "configure lldp tx-interval" can
specify an interval value in milliseconds by appending a "ms" suffix to
the figure. Thus mandating string handling, and not integer comparison.

Tested on 22.03.5

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 79ee4cb)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: Implement location parameter
5667516 
Previously only partially implemented. After commit
5007f48 lldp_location was never removed

Now, add the value of lldp_location to the generated config.

The location param has a few syntaxes, so the config acquires the first
usage from the man page: 'address country EU'

Supplementary fix for PR openwrt#14193 (this param was included in the original
PR openwrt#13018 but the lldp_location fixes were absent from PR openwrt#14193).

Tested on 22.03.5, 22.03.6

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 53252ee)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
systemcrash and others added 10 commits September 17, 2024 12:36
@systemcrash @robimarko
lldpd: implement lldp_policy parameter
601bbdd 
For certain lldp_class scenarios (2 & 3) a policy must be set also.
Class 4 is default, although it's good to handle the policy eventuality.

Here, set a default lldp_policy for all lldp_class scenarios. Any
lldp_policy can now be set.

Depends on PR openwrt#14584 (which introduced an `if` block)

Tested on 22.03.5, 22.03.6

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 497fafb)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: shellcheck fixes
d7765c4 
No functionality/behaviour changes; code is synonymous

Tested on: 22.03.6

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 5364fe0)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: update URL
3d3dad6 
update Makefile URL

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit f753d31)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: fix restart
ca0c236 
Redirection broke in 5364fe0 ("lldpd: shellcheck fixes")

redirects to /dev/null shall be handled correctly (i.e. last).

This fixes these errors on `/etc/init.d/lldpd reload`:

2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null`
2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null`
2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null`
2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null`

Tested-on: 22.03.6
Fixes: 5364fe0 ("lldpd: shellcheck fixes")
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
[ improve commit description, add fixes tag ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 8cf1dce)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: note about capabilities
cec0219 
only available from >= 1.0.15

Comments are useful. Apparently this config parameter was committed when
openwrt used an older version of lldpd which did not yet support it.

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit b476917)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: make capabilities advertisement controllable
af6a852 
Defaults to off.

Only available from >= 1.0.15

These capabilities are sent in TLV.

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 4d8f56b)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: make management address advertisement controllable
7ee813b 
Defaults to off.

Available from >= 0.7.15

These are sent in TLV

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 50021d3)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: extended interface(s) parsing to handle patterns
0b48b83 
For interface type parameters, the man page documents patterns:
```
*,!eth*,!!eth1

uses all interfaces, except interfaces starting with "eth",
but including "eth1".
```

* Renamed `_ifname` to `_l2dev`.
* get the l2dev via network_get_physdev (and not l3dev)
* Glob pattern `*` is also valid - use noglob for this

The net result is that now interface 'names' including globs '*' and '!'
inversions are included in the generated lldpd configs.

Temporarily `set -o noglob` and then `set +o noglob` to disable & enable
globbing respectively, because when we pass `*` as an interface choice,
other file and pathnames get sucked in from where the init script runs,
and the `*` never makes it to lldpd.

Tested extensively on: 22.03.6, 23.05.3

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
[ squash with commit bumping release version ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 4a81d86)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@systemcrash @robimarko
lldpd: fix reload bug: advertisements shall default to on
e3bb358 
Because these capability advertisements default to on in lldpd, they
became absent at reload, and not restart, due to how the reload logic
works ( keep daemon running, send unconfigured and then the new config
via socket ), and it was not evident unless you happened to be looking
for it (e.g. via pcap or tcpdump). It was also not evident from the
manpage ( have now sent patches upstream ).

At reload time, the unconfigure logic disabled them unless they were
explicitly enabled (compare with other settings where 'unconfigure' just
resets them). Now they default to on/enabled at init time, and are
explicitly 'unconfigure'd at startup if the user disables them via:

lldp_mgmt_addr_advertisements=0
lldp_capability_advertisements=0

In other words: explicit is necessary to disable the advertisements.

The same applies to 'configure system capabilities enabled'. Technically
'unconfigure'd is the default but now it is explicit at reload.

Tested on: 23.05.3

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 708101c)
Link: openwrt#15299
Signed-off-by: Robert Marko <robimarko@gmail.com>
@andyboeh @hauke
ramips: mt7621: use lzma-loader for Sercomm NA502s
4d7ad37 
This fixes a well-known "LZMA ERROR 1" error on Sercomm NA502s, reported
on the OpneWrt forum [0].

[0] https://forum.openwrt.org/t/206640

Signed-off-by: Andreas Böhler <dev@aboehler.at>
(cherry picked from commit 6d89aa2)
Link: openwrt#16412
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
@openwrtdiy openwrtdiy merged commit ed60cc9 into pppoe-23.05 Sep 20, 2024
27 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
core packages target/ramips
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@openwrtdiy @spflieger @systemcrash @andyboeh