Author: tuexen
Date: Thu Apr 26 11:07:15 2012
New Revision: 234699
URL: http://svn.freebsd.org/changeset/base/234699

Log:
  Fix a type in an SCTP AUTH related notification. Keep the old name
  for backwards compatibility.
  Spotted by Irene Ruengeler.
  
  MFC after: 3 days

Modified:
  head/sys/netinet/sctp_auth.c
  head/sys/netinet/sctp_uio.h
  head/sys/netinet/sctputil.c

Modified: head/sys/netinet/sctp_auth.c
==============================================================================
--- head/sys/netinet/sctp_auth.c        Thu Apr 26 09:14:52 2012        
(r234698)
+++ head/sys/netinet/sctp_auth.c        Thu Apr 26 11:07:15 2012        
(r234699)
@@ -1801,7 +1801,7 @@ sctp_handle_auth(struct sctp_tcb *stcb, 
                         * shared_key_id, (void
                         * *)stcb->asoc.authinfo.recv_keyid);
                         */
-                       sctp_notify_authentication(stcb, SCTP_AUTH_NEWKEY,
+                       sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY,
                            shared_key_id, stcb->asoc.authinfo.recv_keyid,
                            SCTP_SO_NOT_LOCKED);
                /* compute a new recv assoc key and cache it */

Modified: head/sys/netinet/sctp_uio.h
==============================================================================
--- head/sys/netinet/sctp_uio.h Thu Apr 26 09:14:52 2012        (r234698)
+++ head/sys/netinet/sctp_uio.h Thu Apr 26 11:07:15 2012        (r234699)
@@ -424,7 +424,8 @@ struct sctp_authkey_event {
 };
 
 /* indication values */
-#define SCTP_AUTH_NEWKEY       0x0001
+#define SCTP_AUTH_NEW_KEY      0x0001
+#define SCTP_AUTH_NEWKEY       SCTP_AUTH_NEW_KEY
 #define SCTP_AUTH_NO_AUTH      0x0002
 #define SCTP_AUTH_FREE_KEY     0x0003
 

Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c Thu Apr 26 09:14:52 2012        (r234698)
+++ head/sys/netinet/sctputil.c Thu Apr 26 11:07:15 2012        (r234699)
@@ -3531,7 +3531,7 @@ sctp_ulp_notify(uint32_t notification, s
                sctp_notify_shutdown_event(stcb);
                break;
        case SCTP_NOTIFY_AUTH_NEW_KEY:
-               sctp_notify_authentication(stcb, SCTP_AUTH_NEWKEY, error,
+               sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, error,
                    (uint16_t) (uintptr_t) data,
                    so_locked);
                break;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to