From patchwork Sun Oct 26 22:39:49 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Harrison X-Patchwork-Id: 5840 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id E9385DDE17 for ; Mon, 27 Oct 2008 09:40:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752738AbYJZWjz (ORCPT ); Sun, 26 Oct 2008 18:39:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752713AbYJZWjy (ORCPT ); Sun, 26 Oct 2008 18:39:54 -0400 Received: from rv-out-0506.google.com ([209.85.198.231]:22754 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752646AbYJZWjx (ORCPT ); Sun, 26 Oct 2008 18:39:53 -0400 Received: by rv-out-0506.google.com with SMTP id k40so1833373rvb.1 for ; Sun, 26 Oct 2008 15:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=Iu3ytKKcHu+RTZnUqQNIxrDUEWAVSeKoZ3HiYtzFdyg=; b=nuZZ0KMYwDiuhCmQyiAT5Ym/CTY9HswXpXa8ffRb06bvji6YhE1yB7n5ev0MMic8HV o1cddlDNiThIZV5KUDM9OfvRc315M454YBGvTsiETHs+sfOwBVBi+QnqgeZvM4fCpgKu T7CBCBIpY82OsMe29wval3i+oI+11jc21puDk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=FLcoOkrZXZBAaNwyC4zFbozJDSA7V6Pwxlt44gciH6WeP3+qRt749kh8brAAo0PvZr W/j0I9ICsjRwxfRNUYUtuHpphtoaUfaK1ANa1Tjf4lhJj5neSiT2xfcqwbb0aN6xWPpr 0celtId9Qz1qAO+qDfJqlooIFVhWUvb5BpsJA= Received: by 10.142.179.12 with SMTP id b12mr2297253wff.282.1225060792322; Sun, 26 Oct 2008 15:39:52 -0700 (PDT) Received: from ?192.168.1.108? (216-19-190-48.dyn.novuscom.net [216.19.190.48]) by mx.google.com with ESMTPS id 31sm7021837wff.16.2008.10.26.15.39.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 26 Oct 2008 15:39:51 -0700 (PDT) Subject: [RFC PATCH] printk: add the %pM, %p4, %p6 format specifiers From: Harvey Harrison To: Johannes Berg Cc: David Miller , anders@anduras.de, netdev@vger.kernel.org In-Reply-To: <1225050015.3746.2.camel@johannes.berg> References: <1224892008.3919.27.camel@johannes.berg> <49035AF0.6040700@anduras.de> <1225008096.3478.3.camel@johannes.berg> <20081026.010329.11475786.davem@davemloft.net> <1225009308.3478.22.camel@johannes.berg> <1225009822.3478.30.camel@johannes.berg> <1225047674.10060.10.camel@brick> (sfid-20081026_200122_320043_BFBB81CD) <1225049591.3746.0.camel@johannes.berg> <1225049929.10060.11.camel@brick> (sfid-20081026_203902_019881_0F8064FC) <1225050015.3746.2.camel@johannes.berg> Date: Sun, 26 Oct 2008 15:39:49 -0700 Message-Id: <1225060789.10060.13.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.24.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add format specifiers for printing out colon-separated bytes: MAC addresses (%pM): xx:xx:xx:xx:xx:xx IPv4 addresses (%p4): xx:xx:xx:xx IPv6 addresses (%p6): xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx %#pM, %#p4, %#p6 are also supported and print without the colon separators. [Based on Johannes Berg's initial patch] Signed-off-by: Harvey Harrison --- lib/vsprintf.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index a013bbc..eb19471 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -581,6 +581,58 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie return string(buf, end, sym, field_width, precision, flags); } +static char *ip4_address(char *buf, char *end, u8 *addr, int field_width, + int precision, int flags) +{ + char ip4_addr[4 * 3]; /* (4 * 2 hex digits), 3 colons and trailing zero */ + char *p = ip4_addr; + int i; + + for (i = 0; i < 4; i++) { + p = pack_hex_byte(p, addr[i]); + if (!(flags & SPECIAL) && i != 3) + *p++ = ':'; + } + *p = '\0'; + + return string(buf, end, ip4_addr, field_width, precision, flags & ~SPECIAL); +} + +static char *ip6_address(char *buf, char *end, u8 *addr, int field_width, + int precision, int flags) +{ + char ip6_addr[8 * 5]; /* (8 * 4 hex digits), 7 colons and trailing zero */ + char *p = ip6_addr; + int i; + + for (i = 0; i < 7; i++) { + p = pack_hex_byte(p, addr[2 * i]); + p = pack_hex_byte(p, addr[2 * i + 1]); + if (!(flags & SPECIAL) && i != 6) + *p++ = ':'; + } + *p = '\0'; + + return string(buf, end, ip6_addr, field_width, precision, flags & ~SPECIAL); +} + +static char *mac_address(char *buf, char *end, u8 *addr, int field_width, + int precision, int flags) +{ + char mac_addr[6 * 3]; /* (6 * 2 hex digits), 5 colons and trailing zero */ + char *p = mac_addr; + int i; + + for (i = 0; i < 5; i++) { + p = pack_hex_byte(p, addr[i]); + if (!(flags & SPECIAL) && i != 4) + *p++ = ':'; + } + *p = '\0'; + + return string(buf, end, mac_addr, field_width, precision, flags & ~SPECIAL); +} + /* * Show a '%p' thing. A kernel extension is that the '%p' is followed * by an extra set of alphanumeric characters that are extended format @@ -592,6 +644,12 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie * - 'S' For symbolic direct pointers * - 'R' For a struct resource pointer, it prints the range of * addresses (not the name nor the flags) + * - 'M' For a 6-byte MAC address, it prints the address in the + * usual colon-separated hex notation + * - '4' For a 4-byte IPv4 address, it prints the address in the + * usual colon-separated hex notation + * - 'M' For a 16-byte IPv6 address, it prints the address in colon separated + * big-endian 16 bit hex notation * * Note: The difference between 'S' and 'F' is that on ia64 and ppc64 * function pointers are really function descriptors, which contain a @@ -607,6 +665,12 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field return symbol_string(buf, end, ptr, field_width, precision, flags); case 'R': return resource_string(buf, end, ptr, field_width, precision, flags); + case 'M': + return mac_address(buf, end, ptr, field_width, precision, flags); + case '4': + return ip4_address(buf, end, ptr, field_width, precision, flags); + case '6': + return ip6_address(buf, end, ptr, field_width, precision, flags); } flags |= SMALL; if (field_width == -1) {