X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fpcap.c;h=028dd0cb7b36b3749611de862e6389d076ad0fa4;hb=c6278d208924bb04c41266ddca276712f95533bc;hp=b2cca76118cce84dfe629c63680ec4ccfba25502;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=openvswitch diff --git a/lib/pcap.c b/lib/pcap.c index b2cca761..028dd0cb 100644 --- a/lib/pcap.c +++ b/lib/pcap.c @@ -1,17 +1,17 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include @@ -34,14 +34,16 @@ struct pcap_hdr { uint32_t sigfigs; /* accuracy of timestamps */ uint32_t snaplen; /* max length of captured packets */ uint32_t network; /* data link type */ -} PACKED; +}; +BUILD_ASSERT_DECL(sizeof(struct pcap_hdr) == 24); struct pcaprec_hdr { uint32_t ts_sec; /* timestamp seconds */ uint32_t ts_usec; /* timestamp microseconds */ uint32_t incl_len; /* number of octets of packet saved in file */ uint32_t orig_len; /* actual length of packet */ -} PACKED; +}; +BUILD_ASSERT_DECL(sizeof(struct pcaprec_hdr) == 16); FILE * pcap_open(const char *file_name, const char *mode) @@ -128,7 +130,7 @@ pcap_read(FILE *file, struct ofpbuf **bufp) ((len & 0x0000ff00) << 8) | ((len & 0x000000ff) << 24)); if (swapped_len > 0xffff) { - VLOG_WARN("bad packet length %"PRIu32" or %"PRIu32" " + VLOG_WARN("bad packet length %zu or %"PRIu32" " "reading pcap file", len, swapped_len); return EPROTO;