PERFORCE change 100757 for review
Paolo Pisati
piso at FreeBSD.org
Thu Jul 6 15:23:04 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=100757
Change 100757 by piso at piso_newluxor on 2006/07/06 15:22:21
Reduce the verbosity of alias_data's fields.
Affected files ...
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#5 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#4 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#5 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#5 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#14 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#5 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#5 edit
Differences ...
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#5 (text+ko) ====
@@ -75,7 +75,7 @@
int
fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) {
- if (ah->dport == NULL || ah->original_address == NULL)
+ if (ah->dport == NULL || ah->oaddr == NULL)
return (-1);
if (ntohs(*ah->dport) == CUSEEME_PORT_NUMBER)
return (0);
@@ -88,7 +88,7 @@
int
protohandlerin(struct libalias *la, struct ip *pip, struct alias_data *ah) {
- AliasHandleCUSeeMeIn(la, pip, *ah->original_address);
+ AliasHandleCUSeeMeIn(la, pip, *ah->oaddr);
return (0);
}
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#4 (text+ko) ====
@@ -79,7 +79,7 @@
* is empy/NULL, return a -1 value
*/
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL ||
- ah->maxpacketsize == 0)
+ ah->maxpktsize == 0)
return (-1);
/*
* fingerprint the incoming packet, if it matches any conditions
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#5 (text+ko) ====
@@ -114,7 +114,7 @@
fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) {
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL ||
- ah->maxpacketsize == 0)
+ ah->maxpktsize == 0)
return (-1);
if (ntohs(*ah->dport) == FTP_CONTROL_PORT_NUMBER
|| ntohs(*ah->sport) == FTP_CONTROL_PORT_NUMBER)
@@ -128,7 +128,7 @@
int
protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) {
- AliasHandleFtpOut(la, pip, ah->lnk, ah->maxpacketsize);
+ AliasHandleFtpOut(la, pip, ah->lnk, ah->maxpktsize);
return (0);
}
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#5 (text+ko) ====
@@ -103,7 +103,7 @@
fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) {
if (ah->dport == NULL || ah->dport == NULL || ah->lnk == NULL ||
- ah->maxpacketsize == 0)
+ ah->maxpktsize == 0)
return (-1);
if (ntohs(*ah->dport) == IRC_CONTROL_PORT_NUMBER_1
|| ntohs(*ah->dport) == IRC_CONTROL_PORT_NUMBER_2)
@@ -117,7 +117,7 @@
int
protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) {
- AliasHandleIrcOut(la, pip, ah->lnk, ah->maxpacketsize);
+ AliasHandleIrcOut(la, pip, ah->lnk, ah->maxpktsize);
return (0);
}
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#14 (text+ko) ====
@@ -51,12 +51,12 @@
*/
struct alias_data {
- struct alias_link *lnk;
- struct in_addr *original_address;
- struct in_addr *alias_address;
- uint16_t *alias_port;
- uint16_t *sport, *dport;
- uint16_t maxpacketsize;
+ struct alias_link *lnk;
+ struct in_addr *oaddr; /* Original address. */
+ struct in_addr *aaddr; /* Alias address. */
+ uint16_t *aport; /* Alias port. */
+ uint16_t *sport, *dport; /* Source & destination port */
+ uint16_t maxpktsize; /* Max packet size. */
};
/*
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#5 (text+ko) ====
@@ -91,7 +91,7 @@
fingerprint1(struct libalias *la, struct ip *pip, struct alias_data *ah) {
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL ||
- ah->alias_address == NULL || ah->alias_port == NULL)
+ ah->aaddr == NULL || ah->aport == NULL)
return (-1);
if (ntohs(*ah->dport) == NETBIOS_DGM_PORT_NUMBER
|| ntohs(*ah->sport) == NETBIOS_DGM_PORT_NUMBER)
@@ -105,7 +105,7 @@
int
protohandler1(struct libalias *la, struct ip *pip, struct alias_data *ah) {
- AliasHandleUdpNbt(la, pip, ah->lnk, ah->alias_address, *ah->alias_port);
+ AliasHandleUdpNbt(la, pip, ah->lnk, ah->aaddr, *ah->aport);
return (0);
}
@@ -116,7 +116,7 @@
fingerprint2(struct libalias *la, struct ip *pip, struct alias_data *ah) {
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL ||
- ah->alias_address == NULL || ah->alias_port == NULL)
+ ah->aaddr == NULL || ah->aport == NULL)
return (-1);
if (ntohs(*ah->dport) == NETBIOS_NS_PORT_NUMBER
|| ntohs(*ah->sport) == NETBIOS_NS_PORT_NUMBER)
@@ -131,7 +131,7 @@
protohandler2(struct libalias *la, struct ip *pip, struct alias_data *ah) {
AliasHandleUdpNbtNS(la, pip, ah->lnk, &pip->ip_src, ah->sport,
- ah->alias_address, ah->alias_port);
+ ah->aaddr, ah->aport);
return (0);
}
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#5 (text+ko) ====
@@ -143,7 +143,7 @@
fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) {
if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL ||
- ah->maxpacketsize == 0)
+ ah->maxpktsize == 0)
return (-1);
if (ntohs(*ah->dport) == RTSP_CONTROL_PORT_NUMBER_1
|| ntohs(*ah->sport) == RTSP_CONTROL_PORT_NUMBER_1
@@ -162,8 +162,8 @@
if (ntohs(*ah->dport) == TFTP_PORT_NUMBER)
FindRtspOut(la, pip->ip_src, pip->ip_dst,
- *ah->sport, *ah->alias_port, IPPROTO_UDP);
- else AliasHandleRtspOut(la, pip, ah->lnk, ah->maxpacketsize);
+ *ah->sport, *ah->aport, IPPROTO_UDP);
+ else AliasHandleRtspOut(la, pip, ah->lnk, ah->maxpktsize);
return (0);
}
More information about the p4-projects
mailing list