xnu-4570.51.1.tar.gz

[apple/xnu.git] / bsd / dev / dtrace / scripts / mptcp.d

diff --git a/bsd/dev/dtrace/scripts/mptcp.d b/bsd/dev/dtrace/scripts/mptcp.d
index 5e5c60db54fef8c140622b99517267a710101a96..479b531dcd67bfed718242014a104f1a3693d975 100644 (file)
--- a/bsd/dev/dtrace/scripts/mptcp.d
+++ b/bsd/dev/dtrace/scripts/mptcp.d
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2013-2014 Apple Computer, Inc.  All Rights Reserved.
+ * Copyright (c) 2013-2017 Apple Computer, Inc.  All Rights Reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_LICENSE_HEADER_START@
  *


@@ -48,14 +48,9 @@ inline int MPTCPS_FIN_WAIT_2            = 7;
 #pragma D binding "1.0" MPTCPS_FIN_WAIT_2
 inline int MPTCPS_TIME_WAIT             = 8;
 #pragma D binding "1.0" MPTCPS_TIME_WAIT
 #pragma D binding "1.0" MPTCPS_FIN_WAIT_2
 inline int MPTCPS_TIME_WAIT             = 8;
 #pragma D binding "1.0" MPTCPS_TIME_WAIT

-inline int MPTCPS_FASTCLOSE_WAIT        = 9;
-#pragma D binding "1.0" MPTCPS_FASTCLOSE_WAIT

 inline int MPTCPS_TERMINATE            = 10;
 #pragma D binding "1.0" MPTCPS_TERMINATE
 
 inline int MPTCPS_TERMINATE            = 10;
 #pragma D binding "1.0" MPTCPS_TERMINATE
 

-typedef uint64_t mptcp_key_t;
-typedef uint32_t mptcp_token_t;
-

 typedef struct mptsinfo {
        string          state;
        uint32_t        flags;
 typedef struct mptsinfo {
        string          state;
        uint32_t        flags;


@@ -76,7 +71,6 @@ typedef struct mptsinfo {
        uint64_t        local_idsn;
        uint32_t        sndwnd;
        uint64_t        rcvnxt;
        uint64_t        local_idsn;
        uint32_t        sndwnd;
        uint64_t        rcvnxt;

-       uint64_t        rcvatmark;

        uint64_t        remote_idsn;
        uint32_t        rcvwnd;
        struct mptcb    *mptcb;
        uint64_t        remote_idsn;
        uint32_t        rcvwnd;
        struct mptcb    *mptcb;


@@ -94,15 +88,13 @@ translator mptsinfo_t < struct mptcb *T > {
                       T->mpt_state == MPTCPS_LAST_ACK ? "state-last-ack" :
                       T->mpt_state == MPTCPS_FIN_WAIT_2 ? "state-fin-wait-2" :
                       T->mpt_state == MPTCPS_TIME_WAIT ? "state-time-wait" :
                       T->mpt_state == MPTCPS_LAST_ACK ? "state-last-ack" :
                       T->mpt_state == MPTCPS_FIN_WAIT_2 ? "state-fin-wait-2" :
                       T->mpt_state == MPTCPS_TIME_WAIT ? "state-time-wait" :

-                      T->mpt_state == MPTCPS_FASTCLOSE_WAIT ?
-                          "state-fastclose-wait" :

                       T->mpt_state == MPTCPS_TERMINATE ?
                           "state-terminate" :
                       "<unknown>";
        flags        = T->mpt_flags;
        vers         = T->mpt_version;
        error        = T->mpt_softerror;
                       T->mpt_state == MPTCPS_TERMINATE ?
                           "state-terminate" :
                       "<unknown>";
        flags        = T->mpt_flags;
        vers         = T->mpt_version;
        error        = T->mpt_softerror;

-       localkey     = T->mpt_localkey ? *T->mpt_localkey : 0;
+       localkey     = T->mpt_localkey;

        remotekey    = T->mpt_remotekey;
        localtoken   = T->mpt_localtoken;
        remotetoken  = T->mpt_remotetoken;
        remotekey    = T->mpt_remotekey;
        localtoken   = T->mpt_localtoken;
        remotetoken  = T->mpt_remotetoken;


@@ -117,7 +109,6 @@ translator mptsinfo_t < struct mptcb *T > {
        local_idsn   = T->mpt_local_idsn;
        sndwnd       = T->mpt_sndwnd;
        rcvnxt       = T->mpt_rcvnxt;
        local_idsn   = T->mpt_local_idsn;
        sndwnd       = T->mpt_sndwnd;
        rcvnxt       = T->mpt_rcvnxt;

-       rcvatmark    = T->mpt_rcvatmark;

        remote_idsn  = T->mpt_remote_idsn;
        rcvwnd       = T->mpt_rcvwnd;
        mptcb        = T;
        remote_idsn  = T->mpt_remote_idsn;
        rcvwnd       = T->mpt_rcvwnd;
        mptcb        = T;


@@ -153,7 +144,7 @@ translator mppsinfo_t < struct mppcb *T> {
 typedef struct mptsesinfo {
        uint16_t        numflows;
        uint16_t        nummpcapflows;
 typedef struct mptsesinfo {
        uint16_t        numflows;
        uint16_t        nummpcapflows;

-       connid_t        connid_last;
+       sae_connid_t    connid_last;

        uint8_t         flags;
        struct mptses   *mptses;
 } mptsesinfo_t;
        uint8_t         flags;
        struct mptses   *mptses;
 } mptsesinfo_t;


@@ -210,17 +201,12 @@ inline int MPTSF_ACTIVE         = 0x40000;
 #pragma D binding "1.0" MPTSF_ACTIVE
 inline int MPTSF_MPCAP_CTRSET   = 0x80000;
 #pragma D binding "1.0" MPTSF_MPCAP_CTRSET
 #pragma D binding "1.0" MPTSF_ACTIVE
 inline int MPTSF_MPCAP_CTRSET   = 0x80000;
 #pragma D binding "1.0" MPTSF_MPCAP_CTRSET

-inline int MPTSF_FASTJ_SEND    = 0x100000;
-#pragma D binding "1.0" MPTSF_FASTJ_SEND

 
 typedef struct mptsubinfo {
        uint32_t        flags;
        uint32_t        evctl;
 
 typedef struct mptsubinfo {
        uint32_t        flags;
        uint32_t        evctl;

-       uint32_t        family;
-       connid_t        connid;
+       sae_connid_t    connid;

        uint32_t        rank;
        uint32_t        rank;

-       int32_t         error;
-       uint64_t        sndnxt;

        struct mptsub   *mptsub;
 } mptsubinfo_t;
 
        struct mptsub   *mptsub;
 } mptsubinfo_t;
 


@@ -228,10 +214,6 @@ typedef struct mptsubinfo {
 translator mptsubinfo_t < struct mptsub *T > {
        flags   = T->mpts_flags;
        evctl   = T->mpts_evctl;
 translator mptsubinfo_t < struct mptsub *T > {
        flags   = T->mpts_flags;
        evctl   = T->mpts_evctl;

-       family  = T->mpts_family;

        connid  = T->mpts_connid;
        connid  = T->mpts_connid;

-       rank    = T->mpts_rank;
-       error   = T->mpts_soerror;
-       sndnxt  = T->mpts_sndnxt;

        mptsub  = T;
 };
        mptsub  = T;
 };