From: dv1tas <dv1tas@fbe50366-0c72-4402-a84b-5d246361dba7>
Date: Sat, 17 Dec 2011 19:48:34 +0000 (+0000)
Subject: remove notification commands
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3610763b4f7cb48d6d383ae2c1a9dfae54d14dd;p=people%2Fms%2Fmstpd.git

remove notification commands

git-svn-id: svn://svn.code.sf.net/p/mstpd/code/trunk@23 fbe50366-0c72-4402-a84b-5d246361dba7
---

diff --git a/bridge-stp b/bridge-stp
index 77e2d2e..d9a8b88 100755
--- a/bridge-stp
+++ b/bridge-stp
@@ -44,12 +44,12 @@ case $2 in
         checkpid $pid_file || exit 1
         for b in $MSTP_BRIDGES; do
             if [ "$bridge" == "$b" ]; then
-                exec /sbin/mstpctl notify-daemon-that-stp-is-on $bridge
+                exit 0
             fi
         done
         exit 1 ;;
     stop)
-        exec /sbin/mstpctl notify-daemon-that-stp-is-off $bridge
+        exit 0
         ;;
     *)
         echo "Unknown action:" $2
diff --git a/bridge_track.c b/bridge_track.c
index 75cce58..c2a11e0 100644
--- a/bridge_track.c
+++ b/bridge_track.c
@@ -839,13 +839,3 @@ int CTL_set_fids2mstids(int br_index, __u16 *fids2mstids)
     CTL_CHECK_BRIDGE;
     return MSTP_IN_set_all_fids2mstids(br, fids2mstids) ? 0 : -1;
 }
-
-int CTL_stp_mode_notification(int br_index, bool on)
-{
-    int br_flags;
-    CTL_CHECK_BRIDGE;
-    if(0 > (br_flags = get_flags(br->sysdeps.name)))
-        return br_flags;
-    set_br_up(br, !!(br_flags & IFF_UP), on);
-    return 0;
-}
diff --git a/ctl_functions.h b/ctl_functions.h
index ea2d7e6..5b09a20 100644
--- a/ctl_functions.h
+++ b/ctl_functions.h
@@ -448,23 +448,6 @@ struct set_fids2mstids_OUT
 #define set_fids2mstids_CALL (in->br_index, in->fids2mstids)
 CTL_DECLARE(set_fids2mstids);
 
-/* stp_mode_notification */
-#define CMD_CODE_stp_mode_notification  (122 | RESPONSE_FIRST_HANDLE_LATER)
-#define stp_mode_notification_ARGS (int br_index, bool on)
-struct stp_mode_notification_IN
-{
-    int br_index;
-    bool on;
-};
-struct stp_mode_notification_OUT
-{
-};
-#define stp_mode_notification_COPY_IN  ({ in->br_index = br_index; \
-                                          in->on = on; })
-#define stp_mode_notification_COPY_OUT ({ (void)0; })
-#define stp_mode_notification_CALL (in->br_index, in->on)
-CTL_DECLARE(stp_mode_notification);
-
 /* General case part in ctl command server switch */
 #define SERVER_MESSAGE_CASE(name)                            \
     case CMD_CODE_ ## name : do                              \
diff --git a/ctl_main.c b/ctl_main.c
index ac54a24..4411bbb 100644
--- a/ctl_main.c
+++ b/ctl_main.c
@@ -1191,23 +1191,6 @@ static int cmd_setfid2mstid(int argc, char *const *argv)
     return CTL_set_fid2mstid(br_index, fid, mstid);
 }
 
-static int cmd_stp_mode_notification(int argc, char *const *argv, bool on)
-{
-    int br_index;
-    /* Because this command has special handling,
-     * argc was not checked earlier
-     */
-    if(2 > argc)
-    {
-        fprintf(stderr,
-                "Incorrect number of arguments for notification command\n");
-        exit(1);
-    }
-    if(0 > (br_index = get_index(argv[1], "bridge")))
-        return br_index;
-    return CTL_stp_mode_notification(br_index, on);
-}
-
 struct command
 {
     int nargs;
@@ -1370,12 +1353,6 @@ int main(int argc, char *const *argv)
     argv += optind;
     if(NULL == (cmd = command_lookup(argv[0])))
     {
-        /* Two special commands not intended for interactive use */
-        if(!strcmp(argv[0], "notify-daemon-that-stp-is-on"))
-            return cmd_stp_mode_notification(argc, argv, true);
-        if(!strcmp(argv[0], "notify-daemon-that-stp-is-off"))
-            return cmd_stp_mode_notification(argc, argv, false);
-
         fprintf(stderr, "never heard of command [%s]\n", argv[0]);
         goto help;
     }
@@ -1417,7 +1394,6 @@ CLIENT_SIDE_FUNCTION(set_vid2fid)
 CLIENT_SIDE_FUNCTION(set_fid2mstid)
 CLIENT_SIDE_FUNCTION(set_vids2fids)
 CLIENT_SIDE_FUNCTION(set_fids2mstids)
-CLIENT_SIDE_FUNCTION(stp_mode_notification)
 
 /*********************** Logging *********************/
 
diff --git a/ctl_socket_server.c b/ctl_socket_server.c
index 4650c9c..105ccbb 100644
--- a/ctl_socket_server.c
+++ b/ctl_socket_server.c
@@ -82,7 +82,6 @@ static int handle_message(int cmd, void *inbuf, int lin,
         SERVER_MESSAGE_CASE(set_fid2mstid);
         SERVER_MESSAGE_CASE(set_vids2fids);
         SERVER_MESSAGE_CASE(set_fids2mstids);
-        SERVER_MESSAGE_CASE(stp_mode_notification);
 
         default:
             ERROR("CTL: Unknown command %d", cmd);