summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2020-08-02 01:58:26 +0200
committerGravatar Nikias Bassen2020-08-02 01:58:26 +0200
commit2f8a4a727fea93e8794d9a0b30773d61973a6349 (patch)
tree00d5edc867b0ba54a90945d1d009c98a72c12edf
parent0cd01163e5e30c2005edf4daafecbddea236a0d0 (diff)
downloadusbmuxd-2f8a4a727fea93e8794d9a0b30773d61973a6349.tar.gz
usbmuxd-2f8a4a727fea93e8794d9a0b30773d61973a6349.tar.bz2
device: Add device id to device_control_input() log messages
-rw-r--r--src/device.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/device.c b/src/device.c
index 95d3569..a6afffd 100644
--- a/src/device.c
+++ b/src/device.c
@@ -595,24 +595,24 @@ static void device_control_input(struct mux_device *dev, unsigned char *payload,
595 switch (payload[0]) { 595 switch (payload[0]) {
596 case 3: 596 case 3:
597 if (payload_length > 1) { 597 if (payload_length > 1) {
598 usbmuxd_log(LL_ERROR, "%s: ERROR (on device): %.*s", __func__, payload_length-1, payload+1); 598 usbmuxd_log(LL_ERROR, "Device %d: ERROR: %.*s", dev->id, payload_length-1, payload+1);
599 } else { 599 } else {
600 usbmuxd_log(LL_ERROR, "%s: Got device error payload with empty message", __func__); 600 usbmuxd_log(LL_ERROR, "%s: Device %d: Got device error payload with empty message", __func__, dev->id);
601 } 601 }
602 break; 602 break;
603 case 7: 603 case 7:
604 if (payload_length > 1) { 604 if (payload_length > 1) {
605 usbmuxd_log(LL_INFO, "%s: %.*s", __func__, payload_length-1, payload+1); 605 usbmuxd_log(LL_INFO, "Device %d: %.*s", dev->id, payload_length-1, payload+1);
606 } else { 606 } else {
607 usbmuxd_log(LL_WARNING, "%s: Got payload type %d with empty message", __func__, payload[0]); 607 usbmuxd_log(LL_WARNING, "%s: Device %d: Got payload type %d with empty message", __func__, dev->id, payload[0]);
608 } 608 }
609 break; 609 break;
610 default: 610 default:
611 usbmuxd_log(LL_WARNING, "%s: Got unhandled payload type %d: %.*s", __func__, payload[0], payload_length-1, payload+1); 611 usbmuxd_log(LL_WARNING, "%s: Device %d: Got unhandled payload type %d: %.*s", __func__, dev->id, payload[0], payload_length-1, payload+1);
612 break; 612 break;
613 } 613 }
614 } else { 614 } else {
615 usbmuxd_log(LL_WARNING, "%s: Got a type 1 packet without payload", __func__); 615 usbmuxd_log(LL_WARNING, "%s: Got a type 1 packet without payload for device %d", __func__, dev->id);
616 } 616 }
617} 617}
618 618