From patchwork Mon Apr 21 20:13:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Hockney X-Patchwork-Id: 340863 X-Patchwork-Delegate: regit@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7E9F21401AF for ; Tue, 22 Apr 2014 11:05:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754516AbaDUU0Y (ORCPT ); Mon, 21 Apr 2014 16:26:24 -0400 Received: from elasmtp-scoter.atl.sa.earthlink.net ([209.86.89.67]:55563 "EHLO elasmtp-scoter.atl.sa.earthlink.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754456AbaDUU0Y (ORCPT ); Mon, 21 Apr 2014 16:26:24 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=dk20050327; d=ix.netcom.com; b=VJ1cRn5yUxRuOCtG5B33/MpeomaIbdRNXDGBtDogAs/5EpTOA7A3BKUE68hXD3/8; h=Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:Content-Transfer-Encoding:X-ELNK-Trace:X-Originating-IP; Received: from [24.49.174.127] (helo=server.ford-prefect.net) by elasmtp-scoter.atl.sa.earthlink.net with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.67) (envelope-from ) id 1WcKav-0004Pf-0F; Mon, 21 Apr 2014 16:13:37 -0400 Message-ID: <53557BD6.20401@ix.netcom.com> Date: Mon, 21 Apr 2014 14:13:10 -0600 From: Bob Hockney User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Eric Leblond CC: The netfilter developer mailinglist Subject: [ ulogd PATCH 1/2 ] fix oob_protocol field for mysql X-ELNK-Trace: 715d3caeb3cea72a705cf63f4d61a1ddd6ede3902bc99f8ece99205dc25e5412ac30c6e5e32ee181350badd9bab72f9c350badd9bab72f9c350badd9bab72f9c X-Originating-IP: 24.49.174.127 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org commit 7409897a4c8a07850561c11e52d9b26c667d7a3d Author: Bob Hockney Date: Thu Dec 27 10:38:47 2012 -0700 - make column type for oob_protocol in mysql smallint(5) unsigned (was smallint(5)) highest defined value in linux/if_ether.h is 0xFBFB (64507) but smallint range is -32768 to 32767 Signed-off-by: Bob Hockney --- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html === doc/mysql-ulogd2-flat.sql | 2 +- doc/mysql-ulogd2.sql | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) === diff --git a/doc/mysql-ulogd2-flat.sql b/doc/mysql-ulogd2-flat.sql index d71608c..6d663f6 100644 --- a/doc/mysql-ulogd2-flat.sql +++ b/doc/mysql-ulogd2-flat.sql @@ -51,7 +51,7 @@ CREATE TABLE `ulog2` ( `raw_label` tinyint(3) unsigned default NULL, `mac_saddr_str` varchar(32) default NULL, `mac_daddr_str` varchar(32) default NULL, - `oob_protocol` smallint(5) default NULL, + `oob_protocol` smallint(5) unsigned default NULL, `raw_type` int(10) unsigned default NULL, `mac_str` varchar(255) default NULL, `tcp_sport` int(5) unsigned default NULL, diff --git a/doc/mysql-ulogd2.sql b/doc/mysql-ulogd2.sql index c44f9a9..782f368 100644 --- a/doc/mysql-ulogd2.sql +++ b/doc/mysql-ulogd2.sql @@ -84,7 +84,7 @@ CREATE TABLE `mac` ( `_mac_id` bigint unsigned NOT NULL auto_increment, `mac_saddr` varchar(32) default NULL, `mac_daddr` varchar(32) default NULL, - `mac_protocol` smallint(5) default NULL, + `mac_protocol` smallint(5) unsigned default NULL, UNIQUE KEY `key_id` (`_mac_id`) ) ENGINE=INNODB; @@ -681,7 +681,7 @@ delimiter $$ CREATE FUNCTION INSERT_OR_SELECT_MAC( `_saddr` varchar(32), `_daddr` varchar(32), - `_protocol` smallint(5) + `_protocol` smallint(5) unsigned ) RETURNS bigint unsigned NOT DETERMINISTIC READS SQL DATA @@ -764,7 +764,7 @@ CREATE FUNCTION INSERT_PACKET_FULL( raw_header varchar(256), mac_saddr varchar(32), mac_daddr varchar(32), - mac_protocol smallint(5), + mac_protocol smallint(5) unsigned, _label tinyint(4) unsigned, sctp_sport smallint(5) unsigned, sctp_dport smallint(5) unsigned,