7c3f8f33ab
This patch contains: * checks for malloc return value + treat callers; * modified malloc() + ZeroMemory() to calloc(); * misc fixes of micro errors seen during the code audit: ** some invalid checks in gcc.c, also there were some possible integer overflow. This is interesting because at the end the data are parsed and freed directly, so it's a vulnerability in some kind of dead code (at least useless); ** fixed usage of GetComputerNameExA with just one call, when 2 were used in misc places. According to MSDN GetComputerNameA() is supposed to return an error when called with NULL; ** there were a bug in the command line parsing of shadow; ** in freerdp_dynamic_channel_collection_add() the size of array was multiplied by 4 instead of 2 on resize
90 lines
2.5 KiB
C
90 lines
2.5 KiB
C
/**
|
|
* FreeRDP: A Remote Desktop Protocol Implementation
|
|
* pcap File Format Utils
|
|
*
|
|
* Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
|
*
|
|
* 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
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef FREERDP_UTILS_PCAP_H
|
|
#define FREERDP_UTILS_PCAP_H
|
|
|
|
#include <freerdp/api.h>
|
|
#include <freerdp/types.h>
|
|
|
|
struct _pcap_header
|
|
{
|
|
UINT32 magic_number; /* magic number */
|
|
UINT16 version_major; /* major version number */
|
|
UINT16 version_minor; /* minor version number */
|
|
INT32 thiszone; /* GMT to local correction */
|
|
UINT32 sigfigs; /* accuracy of timestamps */
|
|
UINT32 snaplen; /* max length of captured packets, in octets */
|
|
UINT32 network; /* data link type */
|
|
};
|
|
typedef struct _pcap_header pcap_header;
|
|
|
|
struct _pcap_record_header
|
|
{
|
|
UINT32 ts_sec; /* timestamp seconds */
|
|
UINT32 ts_usec; /* timestamp microseconds */
|
|
UINT32 incl_len; /* number of octets of packet saved in file */
|
|
UINT32 orig_len; /* actual length of packet */
|
|
};
|
|
typedef struct _pcap_record_header pcap_record_header;
|
|
|
|
typedef struct _pcap_record pcap_record;
|
|
|
|
struct _pcap_record
|
|
{
|
|
pcap_record_header header;
|
|
void* data;
|
|
UINT32 length;
|
|
pcap_record* next;
|
|
};
|
|
|
|
struct rdp_pcap
|
|
{
|
|
FILE* fp;
|
|
char* name;
|
|
BOOL write;
|
|
int file_size;
|
|
int record_count;
|
|
pcap_header header;
|
|
pcap_record* head;
|
|
pcap_record* tail;
|
|
pcap_record* record;
|
|
};
|
|
typedef struct rdp_pcap rdpPcap;
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
FREERDP_API rdpPcap* pcap_open(char* name, BOOL write);
|
|
FREERDP_API void pcap_close(rdpPcap* pcap);
|
|
|
|
FREERDP_API BOOL pcap_add_record(rdpPcap* pcap, void* data, UINT32 length);
|
|
FREERDP_API BOOL pcap_has_next_record(rdpPcap* pcap);
|
|
FREERDP_API BOOL pcap_get_next_record(rdpPcap* pcap, pcap_record* record);
|
|
FREERDP_API BOOL pcap_get_next_record_header(rdpPcap* pcap, pcap_record* record);
|
|
FREERDP_API BOOL pcap_get_next_record_content(rdpPcap* pcap, pcap_record* record);
|
|
FREERDP_API void pcap_flush(rdpPcap* pcap);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* FREERDP_UTILS_PCAP_H */
|