-
Notifications
You must be signed in to change notification settings - Fork 1.6k
To improve the error handling of vtysh read config file #15568
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.
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
Draft
StormLiangMS
wants to merge
3
commits into
sonic-net:master
Choose a base branch
from
StormLiangMS:error_handle
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
42 changes: 42 additions & 0 deletions
42
src/sonic-frr/patch/0030-bgpd-error-handling-improve.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
From 33a231ac26a46bfb728975d1695b7a71a7bc95ab Mon Sep 17 00:00:00 2001 | ||
From: stormliang <[email protected]> | ||
Date: Wed, 21 Jun 2023 08:10:10 +0000 | ||
Subject: [PATCH] error handling improve | ||
|
||
--- | ||
vtysh/vtysh.c | 12 ++++++++++++ | ||
1 file changed, 12 insertions(+) | ||
|
||
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c | ||
index 8e95aaa47..9df2011ce 100644 | ||
--- a/vtysh/vtysh.c | ||
+++ b/vtysh/vtysh.c | ||
@@ -25,6 +25,8 @@ | ||
#include <sys/wait.h> | ||
#include <sys/resource.h> | ||
#include <sys/stat.h> | ||
+#include <string.h> | ||
+#include <errno.h> | ||
|
||
/* readline carries some ancient definitions around */ | ||
#pragma GCC diagnostic push | ||
@@ -895,6 +897,16 @@ int vtysh_config_from_file(struct vty *vty, FILE *fp) | ||
} | ||
} | ||
} | ||
+ if (feof(fp)) { | ||
+ // Handle end-of-file (EOF) error | ||
+ vty_out(vty, "fgets error: End of file reached.\n"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. where do we see such message, in syslog? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This PR is not ready for review yet, make it as draft. |
||
+ } else if (ferror(file)) { | ||
+ // Handle general I/O error | ||
+ vty_out(vty, "fgets error: Error occurred while reading input: %s\n", strerror(errno)); | ||
+ } else { | ||
+ // Handle other errors | ||
+ vty_out(vty, "fgets error: Unknown error occurred.\n"); | ||
+ } | ||
|
||
return (retcode); | ||
} | ||
-- | ||
2.25.1 | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this upstream patch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, I this is not upstream patch, I create this one.