From: Volker Lendecke <vl@samba.org>
Date: Sun, 2 Mar 2008 08:43:19 +0000 (+0100)
Subject: Pass specific packets to build_nmb and build_dgram
X-Git-Tag: samba-3.3.0pre1~3380^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb8b6f2404e49d6a837935c5b411d78fb6ff23ef;p=thirdparty%2Fsamba.git

Pass specific packets to build_nmb and build_dgram

To me it was not clear what parts of struct packet_struct are actually used in
build_packet(). This makes it a bit more clear that only the specific parts are
used.
---

diff --git a/source/libsmb/nmblib.c b/source/libsmb/nmblib.c
index 15a9a93ff29..bfe5e7b97bd 100644
--- a/source/libsmb/nmblib.c
+++ b/source/libsmb/nmblib.c
@@ -849,9 +849,8 @@ static bool send_udp(int fd,char *buf,int len,struct in_addr ip,int port)
  If buf == NULL this is a length calculation.
 ******************************************************************/
 
-static int build_dgram(char *buf, size_t len, struct packet_struct *p)
+static int build_dgram(char *buf, size_t len, struct dgram_packet *dgram)
 {
-	struct dgram_packet *dgram = &p->packet.dgram;
 	unsigned char *ubuf = (unsigned char *)buf;
 	int offset=0;
 
@@ -926,9 +925,8 @@ bool nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2)
  If buf == NULL this is a length calculation.
 ******************************************************************/
 
-static int build_nmb(char *buf, size_t len, struct packet_struct *p)
+static int build_nmb(char *buf, size_t len, struct nmb_packet *nmb)
 {
-	struct nmb_packet *nmb = &p->packet.nmb;
 	unsigned char *ubuf = (unsigned char *)buf;
 	int offset=0;
 
@@ -1058,11 +1056,11 @@ int build_packet(char *buf, size_t buflen, struct packet_struct *p)
 
 	switch (p->packet_type) {
 	case NMB_PACKET:
-		len = build_nmb(buf,buflen,p);
+		len = build_nmb(buf,buflen,&p->packet.nmb);
 		break;
 
 	case DGRAM_PACKET:
-		len = build_dgram(buf,buflen,p);
+		len = build_dgram(buf,buflen,&p->packet.dgram);
 		break;
 	}