* [PATCH ipvsadm 0/2] Changes for ipvsadm
@ 2012-07-13 8:48 Julian Anastasov
2012-07-13 8:48 ` [PATCH ipvsadm 1/2] Fix the --pe option checks Julian Anastasov
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Julian Anastasov @ 2012-07-13 8:48 UTC (permalink / raw)
To: Simon Horman; +Cc: Wensong Zhang, lvs-devel
Do we have ipvsadm on git? I downloaded something
from svn to base these two patches.
Julian Anastasov (2):
Fix the --pe option checks
Fallback to libpopt on shared object
Makefile | 15 +++++++++++++++
ipvsadm.c | 32 ++++++++++++++++----------------
2 files changed, 31 insertions(+), 16 deletions(-)
--
1.7.3.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH ipvsadm 1/2] Fix the --pe option checks
2012-07-13 8:48 [PATCH ipvsadm 0/2] Changes for ipvsadm Julian Anastasov
@ 2012-07-13 8:48 ` Julian Anastasov
2012-07-13 8:48 ` [PATCH ipvsadm 2/2] Fallback to libpopt on shared object Julian Anastasov
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Julian Anastasov @ 2012-07-13 8:48 UTC (permalink / raw)
To: Simon Horman; +Cc: Wensong Zhang, lvs-devel
Make sure the --pe option is at its place in
optnames. Now it messes the names of all next options.
Also, add the missing requirements for the --pe option in
commands_v_options.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
---
ipvsadm.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ipvsadm.c b/ipvsadm.c
index 5a54653..0e0a417 100644
--- a/ipvsadm.c
+++ b/ipvsadm.c
@@ -189,7 +189,6 @@ static const char* optnames[] = {
"connection",
"service-address",
"scheduler",
- "pe",
"persistent",
"netmask",
"real-server",
@@ -208,6 +207,7 @@ static const char* optnames[] = {
"syncid",
"exact",
"ops",
+ "pe",
};
/*
@@ -220,21 +220,21 @@ static const char* optnames[] = {
*/
static const char commands_v_options[NUMBER_OF_CMD][NUMBER_OF_OPT] =
{
- /* -n -c svc -s -p -M -r fwd -w -x -y -mc tot dmn -st -rt thr -pc srt sid -ex ops */
-/*ADD*/ {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' '},
-/*EDIT*/ {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' '},
-/*DEL*/ {'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*FLUSH*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*LIST*/ {' ', '1', '1', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', '1', '1', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'x'},
-/*ADDSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*DELSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*EDITSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*TIMEOUT*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*STARTD*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x'},
-/*STOPD*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x'},
-/*RESTORE*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*SAVE*/ {' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*ZERO*/ {'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+ /* -n -c svc -s -p -M -r fwd -w -x -y -mc tot dmn -st -rt thr -pc srt sid -ex ops -pe */
+/*ADD*/ {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', ' '},
+/*EDIT*/ {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', ' '},
+/*DEL*/ {'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*FLUSH*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*LIST*/ {' ', '1', '1', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', '1', '1', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'x', 'x'},
+/*ADDSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*DELSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*EDITSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*TIMEOUT*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*STARTD*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x'},
+/*STOPD*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x'},
+/*RESTORE*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*SAVE*/ {' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*ZERO*/ {'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
};
/* printing format flags */
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH ipvsadm 2/2] Fallback to libpopt on shared object
2012-07-13 8:48 [PATCH ipvsadm 0/2] Changes for ipvsadm Julian Anastasov
2012-07-13 8:48 ` [PATCH ipvsadm 1/2] Fix the --pe option checks Julian Anastasov
@ 2012-07-13 8:48 ` Julian Anastasov
2012-07-17 0:12 ` [PATCH ipvsadm 0/2] Changes for ipvsadm Simon Horman
2012-09-17 1:05 ` [PATCH ipvsadm 0/2] Changes for ipvsadm Simon Horman
3 siblings, 0 replies; 7+ messages in thread
From: Julian Anastasov @ 2012-07-13 8:48 UTC (permalink / raw)
To: Simon Horman; +Cc: Wensong Zhang, lvs-devel
Use shared library if no static library is installed.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
---
Makefile | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index e4e03cc..b411649 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,21 @@ POPT_LIB = $(shell for i in $(LIB_SEARCH); do \
fi; \
fi; \
done)
+ifeq (,$(POPT_LIB))
+POPT_LIB = $(shell for i in $(LIB_SEARCH); do \
+ f1=""; \
+ for so in $$i/libpopt.so*; do \
+ if [ -f $$so ]; then \
+ if objdump -T $$so | fgrep -q poptGetContext; then \
+ echo "-lpopt"; \
+ f1=y; \
+ break; \
+ fi; \
+ fi; \
+ done; \
+ [ "$$f1" != "" ] && break; \
+done)
+endif
endif
ifneq (,$(POPT_LIB))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH ipvsadm 0/2] Changes for ipvsadm
2012-07-13 8:48 [PATCH ipvsadm 0/2] Changes for ipvsadm Julian Anastasov
2012-07-13 8:48 ` [PATCH ipvsadm 1/2] Fix the --pe option checks Julian Anastasov
2012-07-13 8:48 ` [PATCH ipvsadm 2/2] Fallback to libpopt on shared object Julian Anastasov
@ 2012-07-17 0:12 ` Simon Horman
[not found] ` <CAHWFoux81rOetCST7ZbC7dCps=QZh7XV2LZhNa8ES0gQyj5RbA@mail.gmail.com>
2012-09-17 1:05 ` [PATCH ipvsadm 0/2] Changes for ipvsadm Simon Horman
3 siblings, 1 reply; 7+ messages in thread
From: Simon Horman @ 2012-07-17 0:12 UTC (permalink / raw)
To: Julian Anastasov; +Cc: Wensong Zhang, lvs-devel
On Fri, Jul 13, 2012 at 11:48:44AM +0300, Julian Anastasov wrote:
> Do we have ipvsadm on git? I downloaded something
> from svn to base these two patches.
I believe that svn is the canonical source.
Wensong, I'd be happy to see about putting ipvs into git
on kernel.org if you are interested.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH ipvsadm 0/2] Changes for ipvsadm
[not found] ` <CAHWFoux81rOetCST7ZbC7dCps=QZh7XV2LZhNa8ES0gQyj5RbA@mail.gmail.com>
@ 2012-07-18 0:16 ` Simon Horman
2012-09-17 1:04 ` [ANNOUNCE] Ipvsadm GIT repository Simon Horman
0 siblings, 1 reply; 7+ messages in thread
From: Simon Horman @ 2012-07-18 0:16 UTC (permalink / raw)
To: Wensong Zhang; +Cc: Julian Anastasov, lvs-devel
On Wed, Jul 18, 2012 at 12:07:50AM +0800, Wensong Zhang wrote:
> Hi Horms, I have no problem, please convert ipvsadm svn repository to git.
Thanks, will do.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ANNOUNCE] Ipvsadm GIT repository
2012-07-18 0:16 ` Simon Horman
@ 2012-09-17 1:04 ` Simon Horman
0 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2012-09-17 1:04 UTC (permalink / raw)
To: Wensong Zhang; +Cc: Julian Anastasov, Joseph Mack NA3T, lvs-devel
I have created a git repository for ipvsadm on kernel.org,
which includes a change history imported from SVN.
git://git.kernel.org/pub/scm/utils/kernel/ipvsadm/ipvsadm.git
If you have fixes or enhancements for ipvsadm please:
1. Base your changes on the above tree
2. Provide a Signed-off-by line, as per kernel patches
3. Send them to lvs-devel@vger.kernel.org and CC me.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH ipvsadm 0/2] Changes for ipvsadm
2012-07-13 8:48 [PATCH ipvsadm 0/2] Changes for ipvsadm Julian Anastasov
` (2 preceding siblings ...)
2012-07-17 0:12 ` [PATCH ipvsadm 0/2] Changes for ipvsadm Simon Horman
@ 2012-09-17 1:05 ` Simon Horman
3 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2012-09-17 1:05 UTC (permalink / raw)
To: Julian Anastasov; +Cc: Wensong Zhang, lvs-devel
On Fri, Jul 13, 2012 at 11:48:44AM +0300, Julian Anastasov wrote:
> Do we have ipvsadm on git? I downloaded something
> from svn to base these two patches.
Thanks, both patches applied to
git://git.kernel.org/pub/scm/utils/kernel/ipvsadm/ipvsadm.git
Sorry that this took a while.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-09-17 1:05 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-13 8:48 [PATCH ipvsadm 0/2] Changes for ipvsadm Julian Anastasov
2012-07-13 8:48 ` [PATCH ipvsadm 1/2] Fix the --pe option checks Julian Anastasov
2012-07-13 8:48 ` [PATCH ipvsadm 2/2] Fallback to libpopt on shared object Julian Anastasov
2012-07-17 0:12 ` [PATCH ipvsadm 0/2] Changes for ipvsadm Simon Horman
[not found] ` <CAHWFoux81rOetCST7ZbC7dCps=QZh7XV2LZhNa8ES0gQyj5RbA@mail.gmail.com>
2012-07-18 0:16 ` Simon Horman
2012-09-17 1:04 ` [ANNOUNCE] Ipvsadm GIT repository Simon Horman
2012-09-17 1:05 ` [PATCH ipvsadm 0/2] Changes for ipvsadm Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.