Refs #101015 Switch from magic number to manifest constant for maximum message bytes

Author: Nick Briggs

apps/HttpProxy/NetFetch.c

@@ -1374,7 +1374,7 @@ ParseReplyHeader(NetRequest nr) {
 static void
 InitBuffer(NetRequest nr) {
 	// alloc the buffer and init the msg
-	int sz = 8800;
+	int sz = CCN_MAX_MESSAGE_BYTES;
 	nr->buf = ProxyUtil_Alloc(sz+4, char);
 	nr->bufSize = sz;
 	nr->iov.iov_base = nr->buf;

csrc/ccnr/ccnr_dispatch.c

@@ -196,7 +196,7 @@ r_dispatch_process_input(struct ccnr_handle *h, int fd)
     }
     if (fdholder->inbuf->length == 0)
         memset(d, 0, sizeof(*d));
-    buf = ccn_charbuf_reserve(fdholder->inbuf, 8800);
+    buf = ccn_charbuf_reserve(fdholder->inbuf, CCN_MAX_MESSAGE_BYTES);
     memset(&sstor, 0, sizeof(sstor));
     if ((fdholder->flags & CCNR_FACE_SOCKMASK) != 0) {
         res = recvfrom(fdholder->filedesc, buf, fdholder->inbuf->limit - fdholder->inbuf->length,

csrc/ccnr/ccnr_store.c

@@ -150,7 +150,7 @@ r_store_content_read(struct ccnr_handle *h, struct content_entry *content)
     struct ccn_charbuf *cob = NULL;
     ssize_t rres = 0;
     int fd = -1;
-    unsigned char buf[8800];
+    unsigned char buf[CCN_MAX_MESSAGE_BYTES];
     struct ccn_skeleton_decoder decoder = {0};
     struct ccn_skeleton_decoder *d = &decoder;
     ssize_t dres;
@@ -182,7 +182,7 @@ r_store_content_read(struct ccnr_handle *h, struct content_entry *content)
             ccnr_msg(h, "r_store_content_read %u expected %d bytes, but got %d",
                      fd, (int)content->size, (int)rres);
     } else {
-        rres = pread(fd, buf, 8800, offset); // XXX - should be symbolic
+        rres = pread(fd, buf, CCN_MAX_MESSAGE_BYTES, offset); // XXX - should be symbolic
         if (rres == -1) {
             ccnr_msg(h, "r_store_content_read %u :%s (errno = %d)",
                      fd, strerror(errno), errno);

csrc/lib/basicparsetest.c

@@ -42,7 +42,7 @@
 int
 main (int argc, char **argv)
 {
-    unsigned char buf[8800];
+    unsigned char buf[CCN_MAX_MESSAGE_BYTES];
     ssize_t size;
     struct ccn_face_instance *face_instance;
     struct ccn_forwarding_entry *forwarding_entry;

csrc/lib/ccn_client.c

@@ -1834,7 +1834,7 @@ ccn_process_input(struct ccn *h)
         h->inbuf = inbuf = ccn_charbuf_create();
     if (inbuf->length == 0)
         memset(d, 0, sizeof(*d));
-    buf = ccn_charbuf_reserve(inbuf, 8800);
+    buf = ccn_charbuf_reserve(inbuf, CCN_MAX_MESSAGE_BYTES);
     res = read(h->sock, buf, inbuf->limit - inbuf->length);
     if (res == 0) {
         ccn_disconnect(h);

csrc/lib/ccnbtreetest.c

@@ -620,7 +620,7 @@ test_btree_inserts_from_stdin(void)
 
     c = ccn_charbuf_create();
     CHKPTR(c);
-    CHKPTR(ccn_charbuf_reserve(c, 8800));
+    CHKPTR(ccn_charbuf_reserve(c, CCN_MAX_MESSAGE_BYTES));
     while (fgets((char *)c->buf, c->limit, stdin)) {
         item++;
         c->length = strlen((char *)c->buf);

csrc/libexec/udplink.c

@@ -48,8 +48,6 @@
 
 void udplink_fatal(int line, char *format, ...);
 
-#define UDPMAXBUF 8800
-
 #ifdef __CYGWIN__
 /* if_nametoindex() is unsupported on cygwin */
 unsigned if_nametoindex(const char *ifname) { 
@@ -348,7 +346,7 @@ main (int argc, char * const argv[]) {
     struct ccn_skeleton_decoder *ld = &ldecoder;
     struct ccn_skeleton_decoder rdecoder = {0};
     struct ccn_skeleton_decoder *rd = &rdecoder;
-    unsigned char rbuf[UDPMAXBUF];
+    unsigned char rbuf[CCN_MAX_MESSAGE_BYTES];
     struct ccn_charbuf *charbuf;
     ssize_t msgstart = 0;
     ssize_t dres;