Changeset 1016 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Feb 21, 2007 7:57:07 PM (18 years ago)

Author:

vboxsync

Message:

slirp: resync with qemu: added OACK support to tftp server; changed tftp_prefix to take a root directory

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• tftp.c (modified) (5 diffs)
• tftp.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/slirp/tftp.c

@@ -103 +103 @@
   int fd;
   int bytes_read = 0;
-
-#ifndef VBOX
-  fd = open(spt->filename, O_RDONLY | O_BINARY);
-#else /* VBOX */
-  fd = open((char *)spt->filename, O_RDONLY | O_BINARY);
-#endif /* VBOX */
+  char buffer[1024];
+  int n;
+
+  n = snprintf(buffer, sizeof(buffer), "%s/%s",
+               tftp_prefix, spt->filename);
+  if (n >= sizeof(buffer))
+    return -1;
+
+  fd = open(buffer, O_RDONLY | O_BINARY);
 
   if (fd < 0) {
@@ -124 +127 @@
   return bytes_read;
 }
+
+static int tftp_send_oack(struct tftp_session *spt, 
+                          const char *key, uint32_t value,
+                          struct tftp_t *recv_tp)
+{
+    struct sockaddr_in saddr, daddr;
+    struct mbuf *m;
+    struct tftp_t *tp;
+    int n = 0;
+
+    m = m_get();
+
+    if (!m)
+        return -1;
+
+    memset(m->m_data, 0, m->m_size);
+
+    m->m_data += if_maxlinkhdr;
+    tp = (void *)m->m_data;
+    m->m_data += sizeof(struct udpiphdr);
+    
+    tp->tp_op = htons(TFTP_OACK);
+    n += sprintf(tp->x.tp_buf + n, "%s", key) + 1;
+    n += sprintf(tp->x.tp_buf + n, "%u", value) + 1;
+
+    saddr.sin_addr = recv_tp->ip.ip_dst;
+    saddr.sin_port = recv_tp->udp.uh_dport;
+    
+    daddr.sin_addr = spt->client_ip;
+    daddr.sin_port = spt->client_port;
+
+    m->m_len = sizeof(struct tftp_t) - 514 + n - 
+        sizeof(struct ip) - sizeof(struct udphdr);
+    udp_output2(NULL, m, &saddr, &daddr, IPTOS_LOWDELAY);
+
+    return 0;
+}
+
+
 
 static int tftp_send_error(struct tftp_session *spt, 
@@ -281 +323 @@
       return;
   }
+
+  k += 6; /* skipping octet */
 
   /* do sanity checks on the filename */
@@ -299 +343 @@
   /* only allow exported prefixes */
 
-#ifndef VBOX
-  if (!tftp_prefix
-      || (strncmp(spt->filename, tftp_prefix, strlen(tftp_prefix)) != 0)) {
-#else /* VBOX */
-  if (!tftp_prefix
-      || (strncmp((char *)spt->filename, tftp_prefix, strlen(tftp_prefix)) != 0)) {
-#endif /* VBOX */
+  if (!tftp_prefix) {
       tftp_send_error(spt, 2, "Access violation", tp);
       return;
@@ -315 +353 @@
       tftp_send_error(spt, 1, "File not found", tp);
       return;
+  }
+
+  if (src[n - 1] != 0) {
+      tftp_send_error(spt, 2, "Access violation", tp);
+      return;
+  }
+
+  while (k < n) {
+      const char *key, *value;
+
+      key = src + k;
+      k += strlen(key) + 1;
+
+      if (k >= n) {
+          tftp_send_error(spt, 2, "Access violation", tp);
+          return;
+      }
+
+      value = src + k;
+      k += strlen(value) + 1;
+
+      if (strcmp(key, "tsize") == 0) {
+          int tsize = atoi(value);
+          struct stat stat_p;
+
+          if (tsize == 0 && tftp_prefix) {
+              char buffer[1024];
+              int len;
+
+              len = snprintf(buffer, sizeof(buffer), "%s/%s",
+                             tftp_prefix, spt->filename);
+
+              if (stat(buffer, &stat_p) == 0)
+                  tsize = stat_p.st_size;
+              else {
+                  tftp_send_error(spt, 1, "File not found", tp);
+                  return;
+              }
+          }
+
+          tftp_send_oack(spt, "tsize", tsize, tp);
+      }
   }
 

trunk/src/VBox/Devices/Network/slirp/tftp.h

@@ -10 +10 @@
 #define TFTP_ACK    4
 #define TFTP_ERROR  5
+#define TFTP_OACK   6
 
 #define TFTP_FILENAME_MAX 512