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

Zebra rtadv use without init #15582

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Zebra rtadv use without init #15582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fb3364
zebra: rtadv uses uninited data to sendmsg
donaldsharp Mar 19, 2024
ea570f2
tests: Cleanup generate_support_bundle() to not fail
donaldsharp Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions tests/topotests/lib/common_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,14 +936,26 @@ def generate_support_bundle():
"""

tgen = get_topogen()
if tgen is None:
logger.warn(
"Support bundle attempted to be generated, but topogen is not being used"
)
return True

router_list = tgen.routers()
test_name = os.environ.get("PYTEST_CURRENT_TEST").split(":")[-1].split(" ")[0]

bundle_procs = {}
for rname, rnode in router_list.items():
logger.info("Spawn collection of support bundle for %s", rname)
dst_bundle = "{}/{}/support_bundles/{}".format(tgen.logdir, rname, test_name)
rnode.run("mkdir -p " + dst_bundle)
try:
dst_bundle = "{}/{}/support_bundles/{}".format(
tgen.logdir, rname, test_name
)
rnode.run("mkdir -p " + dst_bundle)
except Exception as err:
logger.error("Generation of Support bundle failed {}".format(err))
return True

gen_sup_cmd = [
"/usr/lib/frr/generate_support_bundle.py",
Expand Down
10 changes: 5 additions & 5 deletions zebra/rtadv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@ static int rtadv_recv_packet(struct zebra_vrf *zvrf, int sock, uint8_t *buf,
static void rtadv_send_packet(int sock, struct interface *ifp,
enum ipv6_nd_suppress_ra_status stop)
{
struct msghdr msg;
struct iovec iov;
struct msghdr msg = { 0 };
struct iovec iov = { 0 };
struct cmsghdr *cmsgptr;
struct in6_pktinfo *pkt;
struct sockaddr_in6 addr;
unsigned char buf[RTADV_MSG_SIZE];
char adata[RTADV_ADATA_SIZE];
struct sockaddr_in6 addr = { 0 };
unsigned char buf[RTADV_MSG_SIZE] = { 0 };
char adata[RTADV_ADATA_SIZE] = { 0 };

struct nd_router_advert *rtadv;
int ret;
Expand Down
Loading