aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2010-08-26 15:24:49 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2010-08-26 15:24:49 +0000
commit2771fd8bdf696acfb414fcfc1f17817ccac52e21 (patch)
tree50f0fbe08e690f11d08f6973dfbf5afede85c697 /epan/dissectors
parent397fde3f5111fbf3ae0373766acfba6dfa68cd9c (diff)
Fix a number of doxygen directives.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33930 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-ssl-utils.h9
-rw-r--r--epan/dissectors/packet-tcp.h1
2 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 1de9b8cb7c..9a17d77ea2 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -374,7 +374,7 @@ extern Ssl_private_key_t *
ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd);
/** Deallocate the memory used for specified key
- @param pointer to the key to be freed */
+ @param key pointer to the key to be freed */
extern void
ssl_free_key(Ssl_private_key_t* key);
@@ -409,16 +409,17 @@ ssl_decrypt_pre_master_secret(SslDecryptSession*ssl_session,
StringInfo* encrypted_pre_master, SSL_PRIVATE_KEY *pk);
/** Try to decrypt an ssl record
- @param ssl_session the store all the session data
+ @param ssl ssl_session the store all the session data
@param decoder the stream decoder to be used
@param ct the content type of this ssl record
@param in a pinter to the ssl record to be decrypted
@param inl the record length
- @param out a pointer to the store for the decrypted data
+ @param comp_str
+ @param out_str a pointer to the store for the decrypted data
@param outl the decrypted data len
@return 0 on success */
extern gint
-ssl_decrypt_record(SslDecryptSession*ssl,SslDecoder* decoder, gint ct,
+ssl_decrypt_record(SslDecryptSession* ssl,SslDecoder* decoder, gint ct,
const guchar* in, guint inl, StringInfo* comp_str, StringInfo* out_str, guint* outl);
diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h
index dd2c3af4be..e61514ce51 100644
--- a/epan/dissectors/packet-tcp.h
+++ b/epan/dissectors/packet-tcp.h
@@ -245,6 +245,7 @@ extern gboolean decode_tcp_ports(tvbuff_t *, int, packet_info *, proto_tree *, i
/** Associate process information with a given flow
*
+ * @param frame_num The frame number
* @param local_addr The local IPv4 or IPv6 address of the process
* @param remote_addr The remote IPv4 or IPv6 address of the process
* @param local_port The local TCP port of the process