Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262181AbVEETEt (ORCPT ); Thu, 5 May 2005 15:04:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262133AbVEETEU (ORCPT ); Thu, 5 May 2005 15:04:20 -0400 Received: from c-24-22-18-178.hsd1.or.comcast.net ([24.22.18.178]:46225 "EHLO w-gerrit.beaverton.ibm.com") by vger.kernel.org with ESMTP id S262183AbVEES3N (ORCPT ); Thu, 5 May 2005 14:29:13 -0400 Message-Id: <20050505180931.874820000@us.ibm.com> References: <20050505180731.010896000@us.ibm.com> Date: Thu, 05 May 2005 11:07:42 -0700 To: linux-kernel@vger.kernel.org, ckrm-tech@lists.sourceforge.net Subject: [patch 11/21] CKRM: Change ipaddr_port syntax From: gh@us.ibm.com Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2113 Lines: 64 -- Content-Disposition: inline; filename=06b-ckrm_sockc Signed-Off-By: Chandra Seetharaman Signed-Off-By: Vivek Kashyap Change the ipaddr_port syntax from "xxx.xxx.xxx.xxx\\YY" to "xxx.xxx.xxx.xxx:YY" to make it easy for cut-n-paste. ckrm_sockc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Index: linux-2.6.12-rc3-ckrm5/kernel/ckrm/ckrm_sockc.c =================================================================== --- linux-2.6.12-rc3-ckrm5.orig/kernel/ckrm/ckrm_sockc.c 2005-05-05 09:35:09.000000000 -0700 +++ linux-2.6.12-rc3-ckrm5/kernel/ckrm/ckrm_sockc.c 2005-05-05 09:36:27.000000000 -0700 @@ -343,7 +343,7 @@ static int ckrm_sock_show_members(struct class_lock(core); list_for_each(lh, &core->objlist) { ns = container_of(lh, struct ckrm_net_struct, ckrm_link); - seq_printf(seq, "%d.%d.%d.%d\\%d\n", + seq_printf(seq, "%d.%d.%d.%d:%d\n", NIPQUAD(ns->ns_daddrv4), ns->ns_dport); } class_unlock(core); @@ -459,7 +459,7 @@ ckrm_sock_forced_reclassify(struct ckrm_ return -EPERM; if (id != 0) return -EINVAL; - printk("ckrm_sock_class: reclassify all not net implemented\n"); + printk("socketclass: reclassify all not implemented yet\n"); return 0; } @@ -478,15 +478,15 @@ ckrm_sock_forced_reclassify(struct ckrm_ while (*p2 && (*p2 != '=')) ++p2; p2++; - p2 = v4toi(p2, '\\', &(v4addr)); + p2 = v4toi(p2, ':', &(v4addr)); ns.ns_daddrv4 = htonl(v4addr); ns.ns_family = AF_INET; - p2 = v4toi(++p2, ':', &tmp); + p2 = v4toi(++p2, '/', &tmp); ns.ns_dport = (__u16) tmp; if (*p2) p2 = v4toi(++p2, '\0', &ns.ns_pid); ckrm_sock_forced_reclassify_ns(&ns, target); - break; + return 0; case IPV6: printk(KERN_INFO "rcfs: IPV6 not supported yet\n"); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/