diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.common | 5 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 36 | ||||
| -rw-r--r-- | epan/dfilter/dfilter.h | 10 | ||||
| -rw-r--r-- | epan/ftypes/ftypes.h | 10 | ||||
| -rw-r--r-- | epan/libethereal.def | 482 | ||||
| -rw-r--r-- | epan/plugins.h | 4 | ||||
| -rw-r--r-- | epan/proto.h | 14 | ||||
| -rw-r--r-- | epan/resolv.h | 4 |
8 files changed, 540 insertions, 25 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common index 1999c234f8..dd4e17b8a6 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.22 2004/05/08 08:49:02 guy Exp $ +# $Id: Makefile.common,v 1.23 2004/05/09 10:03:40 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -498,12 +498,13 @@ DISSECTOR_SUPPORT_SRC = \ ../crypt-md5.c \ ../crypt-rc4.c \ ../follow.c \ - ../g711.c \ ../h225-persistentdata.c \ ../in_cksum.c \ ../ipproto.c \ ../packet-dcerpc-nt.c \ ../prefs.c \ + ../print.c \ + ../ps.c \ ../ptvcursor.c \ ../reassemble.c \ ../req_resp_hdrs.c \ diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 648dffa602..a405268949 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -1,11 +1,13 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.39 2004/05/06 20:48:36 obiot Exp $ +# $Id: Makefile.nmake,v 1.40 2004/05/09 10:03:40 guy Exp $ include ..\config.nmake +include <win32.mak> include Makefile.common + ############### no need to modify below this line ######### CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \ @@ -14,10 +16,16 @@ CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL -# For use when making ethereal.dll +# For use when making libethereal.dll libethereal_LIBS = \ - wsock32.lib user32.lib \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(ADNS_LIBS) \ + $(PCRE_LIBS) \ + $(ZLIB_LIBS) \ + $(NET_SNMP_DIR)\win32\lib\netsnmp.lib \ + ftypes\ftypes.lib \ + dfilter\dfilter.lib \ + ..\dissectors.lib .c.obj:: $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $< @@ -50,12 +58,24 @@ OBJECTS=addr_and_mask.obj \ tvbuff.obj \ value_string.obj +all: ftypes dfilter ethereal.lib +!IFDEF ENABLE_LIBETHEREAL +all: ftypes dfilter libethereal.dll +!ELSE all: ftypes dfilter ethereal.lib +!ENDIF + +# For use when making libethereal.dll +libethereal.lib: libethereal.dll +libethereal.exp: libethereal.dll -# For use when making ethereal.dll -#ethereal.dll ethereal.lib : ..\config.h $(OBJECTS) -# link /DLL /out:ethereal.dll $(OBJECTS) $(libethereal_LIBS) +libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter + $(link) $(dlllflags) $(conlibsdll) \ + $(LOCAL_LDFLAGS) \ + /DEF:libethereal.def /OUT:libethereal.dll \ + /IMPLIB:libethereal.lib $(OBJECTS) $(libethereal_LIBS) + ethereal.lib : ..\config.h $(OBJECTS) lib /out:ethereal.lib $(OBJECTS) @@ -66,7 +86,7 @@ ethereal.lib : ..\config.h $(OBJECTS) cd epan clean: - rm -f $(OBJECTS) ethereal.lib $(PDB_FILE) + rm -f $(OBJECTS) ethereal.lib libethereal.dll libethereal.lib libethereal.exp $(PDB_FILE) cd ftypes $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../dfilter diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h index e6b5f3fd8a..764876223b 100644 --- a/epan/dfilter/dfilter.h +++ b/epan/dfilter/dfilter.h @@ -1,5 +1,5 @@ /* - * $Id: dfilter.h,v 1.8 2002/12/02 23:28:16 guy Exp $ + * $Id: dfilter.h,v 1.9 2004/05/09 10:03:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -65,8 +65,12 @@ dfilter_free(dfilter_t *df); /* dfilter_error_msg is NULL if there was no error during dfilter_compile, - * otherwise it points to a displayable error message. */ -extern gchar *dfilter_error_msg; + * otherwise it points to a displayable error message. With MSVC and a + * libethereal.dll, we need a special declaration. + */ + +ETH_VAR_IMPORT gchar *dfilter_error_msg; + /* Apply compiled dfilter */ gboolean diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h index be23651f9f..01ba4e20f2 100644 --- a/epan/ftypes/ftypes.h +++ b/epan/ftypes/ftypes.h @@ -1,7 +1,7 @@ /* ftypes.h * Definitions for field types * - * $Id: ftypes.h,v 1.31 2004/02/27 12:00:32 obiot Exp $ + * $Id: ftypes.h,v 1.32 2004/05/09 10:03:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -226,8 +226,12 @@ void fvalue_init(fvalue_t *fv, ftenum_t ftype); -/* Free all memory used by an fvalue_t */ -extern fvalue_t *fvalue_free_list; +/* Free all memory used by an fvalue_t. With MSVC and a + * libethereal.dll, we need a special declaration. + */ +ETH_VAR_IMPORT fvalue_t *fvalue_free_list; + + #define FVALUE_CLEANUP(fv) \ { \ register FvalueFreeFunc free_value; \ diff --git a/epan/libethereal.def b/epan/libethereal.def new file mode 100644 index 0000000000..7576baa35b --- /dev/null +++ b/epan/libethereal.def @@ -0,0 +1,482 @@ +EXPORTS +abs_time_to_str +address_to_str +add_new_data_source +AdmissionRejectReason_vals DATA +ansi_a_ios401_bsmap_strings DATA +ansi_a_ios401_dtap_strings DATA +ansi_map_opr_code_strings DATA +asn1_bits_decode +asn1_bool_decode +asn1_close +asn1_eoc +asn1_eoc_decode +asn1_err_to_str +asn1_header_decode +asn1_id_decode +asn1_id_decode1 +asn1_int32_decode +asn1_int32_value_decode +asn1_length_decode +asn1_null_decode +asn1_octet_decode +asn1_octet_string_decode +asn1_oid_decode +asn1_oid_value_decode +asn1_open +asn1_sequence_decode +asn1_string_decode +asn1_string_value_decode +asn1_subid_decode +asn1_tag_decode +asn1_uint32_decode +asn1_uint32_value_decode +BandRejectReason_vals DATA +build_follow_filter +call_dissector +capture_ap1394 +capture_arcnet +capture_atm +capture_chdlc +capture_clip +capture_eth +capture_fddi +capture_ieee80211 +capture_ipfc +capture_llap +capture_null +capture_ppp_hdlc +capture_prism +capture_raw +capture_sll +capture_tr +check_col +close_print_dest +col_add_fstr +col_add_str +col_append_fstr +col_append_str +col_clear +col_format_desc +col_format_to_string +col_get_writable +col_prepend_fstr +col_setup +col_set_cls_time +col_set_fence +col_set_str +col_set_writable +compute_timestamp_diff +conversation_add_proto_data +conversation_delete_proto_data +conversation_get_proto_data +conversation_new +conversation_set_dissector +copy_prefs +create_dissector_handle +create_persconffile_dir +create_tempfile +data_out_file DATA +dcerpc_get_proto_hf_opnum +dcerpc_get_proto_name +dcerpc_get_proto_sub_dissector +dcerpc_uuids DATA +decode_boolean_bitfield +decode_enumerated_bitfield +decode_enumerated_bitfield_shifted +decode_numeric_bitfield +deletefile +dfilter_apply_edt +dfilter_compile +dfilter_error_msg DATA +dfilter_free +DisengageReason_vals DATA +DisengageRejectReason_vals DATA +dissector_add +dissector_add_handle +dissector_add_string +dissector_all_tables_foreach_changed +dissector_all_tables_foreach_table +dissector_change +dissector_change_string +dissector_delete +dissector_delete_string +dissector_get_port_handle +dissector_get_string_handle +dissector_handle_get_protocol_index +dissector_handle_get_short_name +dissector_reset +dissector_reset_string +dissector_table_foreach_handle +dissector_try_heuristic +dissector_try_port +dissector_try_string +dissect_ber_bitstring +dissect_ber_boolean +dissect_ber_choice +dissect_ber_generalized_time +dissect_ber_identifier +dissect_ber_integer +dissect_ber_length +dissect_ber_object_identifier +dissect_ber_octet_string +dissect_ber_restricted_string +dissect_ber_sequence +dissect_ber_sequence_of +dissect_ber_set_of +dissect_per_bit_string +dissect_per_BMPString +dissect_per_boolean +dissect_per_choice +dissect_per_constrained_integer +dissect_per_constrained_sequence_of +dissect_per_constrained_set_of +dissect_per_GeneralString +dissect_per_IA5String +dissect_per_integer +dissect_per_NumericString +dissect_per_object_identifier +dissect_per_octet_string +dissect_per_PrintableString +dissect_per_restricted_character_string +dissect_per_sequence +dissect_per_sequence_of +dissect_per_set_of +dissect_tpkt_encap +dissect_xdlc_control +draw_tap_listeners +dtbl_entry_get_handle +dtbl_entry_get_initial_handle +EBCDIC_to_ASCII +EBCDIC_to_ASCII1 +epan_cleanup +epan_dissect_fill_in_columns +epan_dissect_free +epan_dissect_new +epan_dissect_prime_dfilter +epan_dissect_run +epan_init +except_alloc +except_deinit +except_free +except_init +except_pop +except_rethrow +except_setup_try +except_set_allocator +except_take_data +except_throw +except_throwd +except_throwf +except_unhandled_catcher +FacilityReason_vals DATA +fc_fc4_val DATA +file_open_error_message +file_write_error_message +find_conversation +find_dissector +find_dissector_table +find_protocol_by_id +find_tap_id +find_val_for_string +follow_tcp_stats +fragment_add +fragment_add_seq +fragment_add_seq_check +fragment_add_seq_next +fragment_delete +fragment_get +fragment_get_tot_len +fragment_set_partial_reassembly +fragment_set_tot_len +fragment_table_init +free_prefs +ftype_can_contains +ftype_can_eq +ftype_can_ge +ftype_can_gt +ftype_can_le +ftype_can_lt +ftype_can_matches +ftype_can_ne +ftype_can_slice +ftype_pretty_name +fvalue_free_list DATA +fvalue_from_unparsed +fvalue_get +fvalue_get_integer +GatekeeperRejectReason_vals DATA +get_args_as_string +get_basename +get_ber_identifier +get_ber_last_created_item +get_ber_length +get_CDR_any +get_CDR_boolean +get_CDR_char +get_CDR_double +get_CDR_encap_info +get_CDR_enum +get_CDR_fixed +get_CDR_float +get_CDR_interface +get_CDR_long +get_CDR_object +get_CDR_octet +get_CDR_octet_seq +get_CDR_short +get_CDR_string +get_CDR_typeCode +get_CDR_ulong +get_CDR_ushort +get_CDR_wchar +get_CDR_wstring +get_column_char_width +get_column_format +get_column_format_from_str +get_column_format_matches +get_column_longest_string +get_column_title +get_conn_cfilter +get_datafile_path +get_dirname +get_dissector_table_base +get_dissector_table_selector_type +get_dissector_table_ui_name +get_hostname +get_hostname6 +get_persconffile_path +get_tcp_port +get_tempfile_path +get_timestamp_setting +get_udp_port +gsm_a_bssmap_msg_strings DATA +gsm_a_dtap_msg_cc_strings DATA +gsm_a_dtap_msg_gmm_strings DATA +gsm_a_dtap_msg_mm_strings DATA +gsm_a_dtap_msg_rr_strings DATA +gsm_a_dtap_msg_sms_strings DATA +gsm_a_dtap_msg_sm_strings DATA +gsm_a_dtap_msg_ss_strings DATA +gsm_a_pd_str DATA +gsm_map_opr_code_strings DATA +g_resolv_flags DATA +h323_message_body_vals DATA +heur_dissector_add +host_name_lookup_process +incomplete_tcp_stream DATA +InfoRequestNakReason_vals DATA +init_dissection +ip6_to_str +ipv4_get_net_order_addr +ip_to_str +isup_message_type_value DATA +isup_message_type_value_acro DATA +is_big_endian +is_tpkt +LocationRejectReason_vals DATA +match_strval +mtp3_addr_to_str_buf +mtp3_service_indicator_code_short_vals DATA +new_create_dissector_handle +new_register_dissector +nt_cmd_vals DATA +num_tap_filters DATA +num_tree_types DATA +open_print_dest +plugin_list DATA +postseq_cleanup_all_protocols +prefs DATA +prefs_apply_all +prefs_get_title_by_name +prefs_is_registered_protocol +prefs_modules_foreach +prefs_module_list_foreach +prefs_pref_foreach +prefs_register_bool_preference +prefs_register_enum_preference +prefs_register_modules +prefs_register_obsolete_preference +prefs_register_protocol +prefs_register_string_preference +prefs_register_uint_preference +prefs_set_pref +print_finale +print_formfeed +print_hex_data +print_line +print_packet_header +print_preamble +protocols_module DATA +proto_can_match_selected +proto_can_toggle_protocol +proto_construct_dfilter_string +proto_find_field_from_offset +proto_find_finfo +proto_get_finfo_ptr_array +proto_get_first_protocol +proto_get_first_protocol_field +proto_get_id_by_filter_name +proto_get_next_protocol +proto_get_next_protocol_field +proto_get_protocol_filter_name +proto_get_protocol_name +proto_get_protocol_short_name +proto_is_protocol_enabled +proto_item_add_subtree +proto_item_append_text +proto_item_fill_label +proto_item_get_len +proto_item_get_parent +proto_item_get_parent_nth +proto_item_get_subtree +proto_item_set_end +proto_item_set_len +proto_item_set_text +proto_register_field_array +proto_register_protocol +proto_register_subtree_array +proto_registrar_dump_fields +proto_registrar_dump_protocols +proto_registrar_get_abbrev +proto_registrar_get_byname +proto_registrar_get_ftype +proto_registrar_get_nth +proto_registrar_get_parent +proto_registrar_is_protocol +proto_registrar_n +proto_set_cant_toggle +proto_set_decoding +proto_tree_add_boolean +proto_tree_add_boolean_format +proto_tree_add_boolean_hidden +proto_tree_add_bytes +proto_tree_add_bytes_format +proto_tree_add_bytes_hidden +proto_tree_add_double +proto_tree_add_double_format +proto_tree_add_double_hidden +proto_tree_add_ether +proto_tree_add_ether_format +proto_tree_add_ether_hidden +proto_tree_add_int +proto_tree_add_int_format +proto_tree_add_int_hidden +proto_tree_add_ipv4 +proto_tree_add_ipv4_format +proto_tree_add_ipv4_hidden +proto_tree_add_ipv6 +proto_tree_add_ipv6_format +proto_tree_add_ipv6_hidden +proto_tree_add_ipxnet +proto_tree_add_ipxnet_format +proto_tree_add_ipxnet_hidden +proto_tree_add_item +proto_tree_add_item_hidden +proto_tree_add_none_format +proto_tree_add_protocol_format +proto_tree_add_string +proto_tree_add_string_format +proto_tree_add_string_hidden +proto_tree_add_text +proto_tree_add_time +proto_tree_add_time_format +proto_tree_add_time_hidden +proto_tree_add_uint +proto_tree_add_uint_format +proto_tree_add_uint_hidden +proto_tree_children_foreach +proto_tree_get_parent +proto_tree_print +p_add_proto_data +p_get_proto_data +RasMessage_vals DATA +read_prefs +read_prefs_file +reassembled_table_init +register_all_protocols +register_all_protocol_handoffs +register_dissector +register_dissector_table +register_giop_user +register_giop_user_module +register_heur_dissector_list +register_init_routine +register_postseq_cleanup_routine +register_tap +register_tap_listener +RegistrationRejectReason_vals DATA +ReleaseCompleteReason_vals DATA +remove_tap_listener +report_failure +report_open_failure +report_read_failure +reset_tap_listeners +reset_tcp_reassembly +rpc_procs DATA +rpc_proc_name +rpc_progs DATA +rpc_prog_hf +rpc_prog_name +set_actual_length +set_timestamp_setting +show_fragment_seq_tree +show_fragment_tree +sid_name_snooping DATA +sid_name_table DATA +smb_cmd_vals DATA +string_to_name_resolve +tap_push_tapped_queue +tap_queue_init +tap_queue_packet +tcp_dissect_pdus +test_for_directory +test_for_fifo +time_msecs_to_str +time_secs_to_str +trans2_cmd_vals DATA +tree_is_expanded DATA +tvb_bytes_exist +tvb_bytes_to_str +tvb_find_guint8 +tvb_find_line_end +tvb_find_line_end_unquoted +tvb_format_text +tvb_get_guint8 +tvb_get_letoh24 +tvb_get_letohl +tvb_get_letohs +tvb_get_nstringz +tvb_get_nstringz0 +tvb_get_ntoh24 +tvb_get_ntohl +tvb_get_ntohs +tvb_get_ptr +tvb_get_string +tvb_get_stringz +tvb_length +tvb_length_remaining +tvb_memcpy +tvb_memdup +tvb_new_real_data +tvb_new_subset +tvb_offset_exists +tvb_pbrk_guint8 +tvb_reported_length +tvb_reported_length_remaining +tvb_set_child_real_data_tvbuff +tvb_set_free_cb +tvb_strncaseeql +tvb_strneql +tvb_strnlen +tvb_strsize +UnregRejectReason_vals DATA +UnregRequestReason_vals DATA +vals_pdu_type DATA +vals_status DATA +val_to_str +write_prefs +xml_escape + + + diff --git a/epan/plugins.h b/epan/plugins.h index 1a3695153a..362a4a7e2a 100644 --- a/epan/plugins.h +++ b/epan/plugins.h @@ -1,7 +1,7 @@ /* plugins.h * definitions for plugins structures * - * $Id: plugins.h,v 1.9 2002/08/28 20:40:44 jmayer Exp $ + * $Id: plugins.h,v 1.10 2004/05/09 10:03:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -39,7 +39,7 @@ typedef struct _plugin { struct _plugin *next; /* forward link */ } plugin; -extern plugin *plugin_list; +ETH_VAR_IMPORT plugin *plugin_list; void init_plugins(const char *); void register_all_plugin_handoffs(void); diff --git a/epan/proto.h b/epan/proto.h index 9aeca9e9a7..4b3d5e9666 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -1,7 +1,7 @@ /* proto.h * Definitions for protocol display * - * $Id: proto.h,v 1.62 2004/05/09 09:26:31 ulfl Exp $ + * $Id: proto.h,v 1.63 2004/05/09 10:03:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -665,11 +665,15 @@ extern void proto_registrar_dump_fields(void); /* Points to the first element of an array of Booleans, indexed by a subtree item type; that array element is TRUE if subtrees of - an item of that type are to be expanded. */ -extern gboolean *tree_is_expanded; + an item of that type are to be expanded. With MSVC and a + libethereal.dll, we need a special declaration. + */ +ETH_VAR_IMPORT gboolean *tree_is_expanded; -/* Number of elements in that array. */ -extern int num_tree_types; +/* Number of elements in that array. With MSVC and a + * libethereal.dll, we need a special declaration. + */ +ETH_VAR_IMPORT int num_tree_types; /* glib doesn't have g_ptr_array_len of all things!*/ #ifndef g_ptr_array_len diff --git a/epan/resolv.h b/epan/resolv.h index 323e5cc1ed..1eef0da6fc 100644 --- a/epan/resolv.h +++ b/epan/resolv.h @@ -1,7 +1,7 @@ /* resolv.h * Definitions for network object lookup * - * $Id: resolv.h,v 1.16 2004/02/13 01:09:51 guy Exp $ + * $Id: resolv.h,v 1.17 2004/05/09 10:03:40 guy Exp $ * * Laurent Deniel <laurent.deniel@free.fr> * @@ -34,7 +34,7 @@ /* * Flag controlling what names to resolve. */ -extern guint32 g_resolv_flags; +ETH_VAR_IMPORT guint32 g_resolv_flags; /* 32 types are sufficient (as are 640k of RAM) */ /* FIXME: Maybe MANUF/m, IP/i, IP6/6, IPX/x, UDP+TCP/t etc would be |