diff options
| author | Munikrishna <jmunikrishna@google.com> | 2024-05-14 05:34:23 +0000 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2024-05-14 05:34:23 +0000 |
| commit | d2eead475ed619c41cd984a3317a25237fbef1ca (patch) | |
| tree | c2f04cdbee8dd6205d7e3ceb8c633daebe0e981d | |
| parent | 2638c85b928af6659f6b7d3d0ef6fa735f791145 (diff) | |
| download | proto_logging-master.tar.gz | |
Use existing ike_state in place of session_state.
Bug: b/326878593
Test: Verified creating atoms from the IKE library
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:be7be7dce5dd674d7c0b378b5976c9d74f633f32)
Merged-In: Ib709c9b5a4bcebf0cce8340d02f2d43e3a308c41
Change-Id: Ib709c9b5a4bcebf0cce8340d02f2d43e3a308c41
| -rw-r--r-- | stats/atoms/ike/ike_extension_atoms.proto | 2 | ||||
| -rw-r--r-- | stats/enums/stats/ike/ike.proto | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/stats/atoms/ike/ike_extension_atoms.proto b/stats/atoms/ike/ike_extension_atoms.proto index c25e48d8..b370f61a 100644 --- a/stats/atoms/ike/ike_extension_atoms.proto +++ b/stats/atoms/ike/ike_extension_atoms.proto @@ -90,7 +90,7 @@ message NegotiatedSecurityAssociation { optional android.stats.ike.SessionType session_type = 2; /** Initial session setup or Rekey session */ - optional android.stats.ike.SessionState session_state = 3; + optional android.stats.ike.IkeState ike_state = 3; /** negotiated DH-Groups */ optional android.stats.ike.DhGroups dh_group = 4; diff --git a/stats/enums/stats/ike/ike.proto b/stats/enums/stats/ike/ike.proto index 82b6bd09..2fbc8f99 100644 --- a/stats/enums/stats/ike/ike.proto +++ b/stats/enums/stats/ike/ike.proto @@ -29,12 +29,6 @@ enum SessionType { SESSION_CHILD = 2; } -enum SessionState { - SESSION_STATE_UNKNOWN = 0; - SESSION_STATE_INITIAL = 1; - SESSION_STATE_REKEY = 2; -} - enum IkeState { STATE_UNKNOWN = 0; STATE_IKE_KILL = 1; |