From 39864c12fdaf5f0b6509a0a6504dfc97c859ceb8 Mon Sep 17 00:00:00 2001
From: Michal Labedzki <michal.labedzki@tieto.com>
Date: Thu, 18 Sep 2014 10:47:41 +0200
Subject: [PATCH] Logcat: Add more save formats over exported pdu

Add all logcat format like brief, threadtime, long, etc. when try to save
logcat logs where there is EXPORTED_PDU layer.

Change-Id: I338f0bbd46dd8db984efc1c03980c7e9c7401a44
Reviewed-on: https://code.wireshark.org/review/4164
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
---
 wiretap/logcat_text.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c
index 6b5306a34f..7ca2c7cc5b 100644
--- a/wiretap/logcat_text.c
+++ b/wiretap/logcat_text.c
@@ -321,6 +321,7 @@ int logcat_text_brief_dump_can_write_encap(int encap) {
     switch (encap) {
     case WTAP_ENCAP_LOGCAT:
     case WTAP_ENCAP_LOGCAT_BRIEF:
+    case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
         return 0;
     default:
         return WTAP_ERR_UNSUPPORTED_ENCAP;
@@ -334,6 +335,7 @@ int logcat_text_process_dump_can_write_encap(int encap) {
     switch (encap) {
     case WTAP_ENCAP_LOGCAT:
     case WTAP_ENCAP_LOGCAT_PROCESS:
+    case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
         return 0;
     default:
         return WTAP_ERR_UNSUPPORTED_ENCAP;
@@ -347,6 +349,7 @@ int logcat_text_tag_dump_can_write_encap(int encap) {
     switch (encap) {
     case WTAP_ENCAP_LOGCAT:
     case WTAP_ENCAP_LOGCAT_TAG:
+    case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
         return 0;
     default:
         return WTAP_ERR_UNSUPPORTED_ENCAP;
@@ -360,6 +363,7 @@ int logcat_text_time_dump_can_write_encap(int encap) {
     switch (encap) {
     case WTAP_ENCAP_LOGCAT:
     case WTAP_ENCAP_LOGCAT_TIME:
+    case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
         return 0;
     default:
         return WTAP_ERR_UNSUPPORTED_ENCAP;
@@ -373,6 +377,7 @@ int logcat_text_thread_dump_can_write_encap(int encap) {
     switch (encap) {
     case WTAP_ENCAP_LOGCAT:
     case WTAP_ENCAP_LOGCAT_THREAD:
+    case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
         return 0;
     default:
         return WTAP_ERR_UNSUPPORTED_ENCAP;
@@ -386,6 +391,7 @@ int logcat_text_threadtime_dump_can_write_encap(int encap) {
     switch (encap) {
     case WTAP_ENCAP_LOGCAT:
     case WTAP_ENCAP_LOGCAT_THREADTIME:
+    case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
         return 0;
     default:
         return WTAP_ERR_UNSUPPORTED_ENCAP;
@@ -399,6 +405,7 @@ int logcat_text_long_dump_can_write_encap(int encap) {
     switch (encap) {
     case WTAP_ENCAP_LOGCAT:
     case WTAP_ENCAP_LOGCAT_LONG:
+    case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
         return 0;
     default:
         return WTAP_ERR_UNSUPPORTED_ENCAP;