9 files changed, 181 insertions, 245 deletions

diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
index 323f72c64cd2..b2de9916c32c 100644
--- a/arch/um/drivers/Makefile
+++ b/arch/um/drivers/Makefile
@@ -22,8 +22,8 @@ obj-y := stdio_console.o fd.o chan_kern.o chan_user.o line.o
 obj-$(CONFIG_SSL) += ssl.o
 obj-$(CONFIG_STDERR_CONSOLE) += stderr_console.o
 
-obj-$(CONFIG_UML_NET_SLIP) += slip.o
-obj-$(CONFIG_UML_NET_SLIRP) += slirp.o
+obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o
+obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o
 obj-$(CONFIG_UML_NET_DAEMON) += daemon.o 
 obj-$(CONFIG_UML_NET_MCAST) += mcast.o 
 #obj-$(CONFIG_UML_NET_PCAP) += pcap.o $(PCAP)
@@ -41,6 +41,6 @@ obj-$(CONFIG_UML_WATCHDOG) += harddog.o
 obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
 obj-$(CONFIG_UML_RANDOM) += random.o
 
-USER_OBJS := fd.o null.o pty.o tty.o xterm.o
+USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o
 
 include arch/um/scripts/Makefile.rules
diff --git a/arch/um/drivers/slip.h b/arch/um/drivers/slip.h
index d523618cd5ac..bb0dab41c2e4 100644
--- a/arch/um/drivers/slip.h
+++ b/arch/um/drivers/slip.h
@@ -1,10 +1,7 @@
 #ifndef __UM_SLIP_H
 #define __UM_SLIP_H
 
-#define BUF_SIZE 1500
- /* two bytes each for a (pathological) max packet of escaped chars +  * 
-  * terminating END char + initial END char                            */
-#define ENC_BUF_SIZE (2 * BUF_SIZE + 2)
+#include "slip_common.h"
 
 struct slip_data {
         void *dev;
@@ -12,28 +9,12 @@ struct slip_data {
         char *addr;
         char *gate_addr;
         int slave;
-        unsigned char ibuf[ENC_BUF_SIZE];
-        unsigned char obuf[ENC_BUF_SIZE];
-        int more; /* more data: do not read fd until ibuf has been drained */
-        int pos;
-        int esc;
+        struct slip_proto slip;
 };
 
 extern struct net_user_info slip_user_info;
 
-extern int set_umn_addr(int fd, char *addr, char *ptp_addr);
 extern int slip_user_read(int fd, void *buf, int len, struct slip_data *pri);
 extern int slip_user_write(int fd, void *buf, int len, struct slip_data *pri);
 
 #endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/drivers/slip_common.c b/arch/um/drivers/slip_common.c
new file mode 100644
index 000000000000..e89cfc68fc3e
--- /dev/null
+++ b/arch/um/drivers/slip_common.c
@@ -0,0 +1,54 @@
+#include <string.h>
+#include "slip_common.h"
+#include "net_user.h"
+
+int slip_proto_read(int fd, void *buf, int len, struct slip_proto *slip)
+{
+        int i, n, size, start;
+
+        if(slip->more > 0){
+                i = 0;
+                while(i < slip->more){
+                        size = slip_unesc(slip->ibuf[i++], slip->ibuf,
+                                          &slip->pos, &slip->esc);
+                        if(size){
+                                memcpy(buf, slip->ibuf, size);
+                                memmove(slip->ibuf, &slip->ibuf[i],
+                                        slip->more - i);
+                                slip->more = slip->more - i;
+                                return size;
+                        }
+                }
+                slip->more = 0;
+        }
+
+        n = net_read(fd, &slip->ibuf[slip->pos],
+                     sizeof(slip->ibuf) - slip->pos);
+        if(n <= 0)
+                return n;
+
+        start = slip->pos;
+        for(i = 0; i < n; i++){
+                size = slip_unesc(slip->ibuf[start + i], slip->ibuf,&slip->pos,
+                                  &slip->esc);
+                if(size){
+                        memcpy(buf, slip->ibuf, size);
+                        memmove(slip->ibuf, &slip->ibuf[start+i+1],
+                                n - (i + 1));
+                        slip->more = n - (i + 1);
+                        return size;
+                }
+        }
+        return 0;
+}
+
+int slip_proto_write(int fd, void *buf, int len, struct slip_proto *slip)
+{
+        int actual, n;
+
+        actual = slip_esc(buf, slip->obuf, len);
+        n = net_write(fd, slip->obuf, actual);
+        if(n < 0)
+                return n;
+        else return len;
+}
diff --git a/arch/um/drivers/slip_proto.h b/arch/um/drivers/slip_common.h
index 4c4d94a33100..2ae76d8f1be1 100644
--- a/arch/um/drivers/slip_proto.h
+++ b/arch/um/drivers/slip_common.h
@@ -1,10 +1,10 @@
-/* 
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
+#ifndef __UM_SLIP_COMMON_H
+#define __UM_SLIP_COMMON_H
 
-#ifndef __UM_SLIP_PROTO_H__
-#define __UM_SLIP_PROTO_H__
+#define BUF_SIZE 1500
+ /* two bytes each for a (pathological) max packet of escaped chars +  *
+  * terminating END char + initial END char                            */
+#define ENC_BUF_SIZE (2 * BUF_SIZE + 2)
 
 /* SLIP protocol characters. */
 #define SLIP_END             0300       /* indicates end of frame       */
@@ -80,15 +80,25 @@ static inline int slip_esc(unsigned char *s, unsigned char *d, int len)
         return (ptr - d);
 }
 
-#endif
+struct slip_proto {
+        unsigned char ibuf[ENC_BUF_SIZE];
+        unsigned char obuf[ENC_BUF_SIZE];
+        int more; /* more data: do not read fd until ibuf has been drained */
+        int pos;
+        int esc;
+};
+
+#define SLIP_PROTO_INIT { \
+        .ibuf   = { '\0' }, \
+        .obuf   = { '\0' }, \
+        .more   = 0, \
+        .pos    = 0, \
+        .esc    = 0 \
+}
 
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
+extern int slip_proto_read(int fd, void *buf, int len,
+                           struct slip_proto *slip);
+extern int slip_proto_write(int fd, void *buf, int len,
+                            struct slip_proto *slip);
+
+#endif
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index 0886eedba213..9a6f5c85f902 100644
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
@@ -26,16 +26,16 @@ void slip_init(struct net_device *dev, void *data)
                   .addr         = NULL,
                   .gate_addr    = init->gate_addr,
                   .slave        = -1,
-                  .ibuf         = { '\0' },
-                  .obuf         = { '\0' },
-                  .pos          = 0,
-                  .esc          = 0,
+                  .slip         = SLIP_PROTO_INIT,
                   .dev          = dev });
 
         dev->init = NULL;
+        dev->header_cache_update = NULL;
+        dev->hard_header_cache = NULL;
+        dev->hard_header = NULL;
         dev->hard_header_len = 0;
-        dev->addr_len = 4;
-        dev->type = ARPHRD_ETHER;
+        dev->addr_len = 0;
+        dev->type = ARPHRD_SLIP;
         dev->tx_queue_len = 256;
         dev->flags = IFF_NOARP;
         printk("SLIP backend - SLIP IP = %s\n", spri->gate_addr);
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index d94846b1b4cf..71af444e591f 100644
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -13,7 +13,7 @@
 #include "user.h"
 #include "net_user.h"
 #include "slip.h"
-#include "slip_proto.h"
+#include "slip_common.h"
 #include "helper.h"
 #include "os.h"
 
@@ -77,41 +77,51 @@ static int slip_tramp(char **argv, int fd)
         err = os_pipe(fds, 1, 0);
         if(err < 0){
                 printk("slip_tramp : pipe failed, err = %d\n", -err);
-                return(err);
+                goto out;
         }
 
         err = 0;
         pe_data.stdin = fd;
         pe_data.stdout = fds[1];
         pe_data.close_me = fds[0];
-        pid = run_helper(slip_pre_exec, &pe_data, argv, NULL);
+        err = run_helper(slip_pre_exec, &pe_data, argv, NULL);
+        if(err < 0)
+                goto out_close;
+        pid = err;
+
+        output_len = page_size();
+        output = um_kmalloc(output_len);
+        if(output == NULL){
+                printk("slip_tramp : failed to allocate output buffer\n");
+                os_kill_process(pid, 1);
+                err = -ENOMEM;
+                goto out_free;
+        }
 
-        if(pid < 0) err = pid;
-        else {
-                output_len = page_size();
-                output = um_kmalloc(output_len);
-                if(output == NULL)
-                        printk("slip_tramp : failed to allocate output "
-                               "buffer\n");
-
-                os_close_file(fds[1]);
-                read_output(fds[0], output, output_len);
-                if(output != NULL){
-                        printk("%s", output);
-                        kfree(output);
-                }
-                CATCH_EINTR(err = waitpid(pid, &status, 0));
-                if(err < 0)
-                        err = errno;
-                else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0)){
-                        printk("'%s' didn't exit with status 0\n", argv[0]);
-                        err = -EINVAL;
-                }
+        os_close_file(fds[1]);
+        read_output(fds[0], output, output_len);
+        printk("%s", output);
+
+        CATCH_EINTR(err = waitpid(pid, &status, 0));
+        if(err < 0)
+                err = errno;
+        else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0)){
+                printk("'%s' didn't exit with status 0\n", argv[0]);
+                err = -EINVAL;
         }
+        else err = 0;
 
         os_close_file(fds[0]);
 
-        return(err);
+out_free:
+        kfree(output);
+        return err;
+
+out_close:
+        os_close_file(fds[0]);
+        os_close_file(fds[1]);
+out:
+        return err;
 }
 
 static int slip_open(void *data)
@@ -123,21 +133,26 @@ static int slip_open(void *data)
                          NULL };
         int sfd, mfd, err;
 
-        mfd = get_pty();
-        if(mfd < 0){
-                printk("umn : Failed to open pty, err = %d\n", -mfd);
-                return(mfd);
+        err = get_pty();
+        if(err < 0){
+                printk("slip-open : Failed to open pty, err = %d\n", -err);
+                goto out;
         }
-        sfd = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0);
-        if(sfd < 0){
-                printk("Couldn't open tty for slip line, err = %d\n", -sfd);
-                os_close_file(mfd);
-                return(sfd);
+        mfd = err;
+
+        err = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0);
+        if(err < 0){
+                printk("Couldn't open tty for slip line, err = %d\n", -err);
+                goto out_close;
         }
-        if(set_up_tty(sfd)) return(-1);
+        sfd = err;
+
+        if(set_up_tty(sfd))
+                goto out_close2;
+
         pri->slave = sfd;
-        pri->pos = 0;
-        pri->esc = 0;
+        pri->slip.pos = 0;
+        pri->slip.esc = 0;
         if(pri->gate_addr != NULL){
                 sprintf(version_buf, "%d", UML_NET_VERSION);
                 strcpy(gate_buf, pri->gate_addr);
@@ -146,12 +161,12 @@ static int slip_open(void *data)
 
                 if(err < 0){
                         printk("slip_tramp failed - err = %d\n", -err);
-                        return(err);
+                        goto out_close2;
                 }
                 err = os_get_ifname(pri->slave, pri->name);
                 if(err < 0){
                         printk("get_ifname failed, err = %d\n", -err);
-                        return(err);
+                        goto out_close2;
                 }
                 iter_addresses(pri->dev, open_addr, pri->name);
         }
@@ -160,10 +175,16 @@ static int slip_open(void *data)
                 if(err < 0){
                         printk("Failed to set slip discipline encapsulation - "
                                "err = %d\n", -err);
-                        return(err);
+                        goto out_close2;
                 }
         }
         return(mfd);
+out_close2:
+        os_close_file(sfd);
+out_close:
+        os_close_file(mfd);
+out:
+        return err;
 }
 
 static void slip_close(int fd, void *data)
@@ -190,48 +211,12 @@ static void slip_close(int fd, void *data)
 
 int slip_user_read(int fd, void *buf, int len, struct slip_data *pri)
 {
-        int i, n, size, start;
-
-        if(pri->more>0) {
-                i = 0;
-                while(i < pri->more) {
-                        size = slip_unesc(pri->ibuf[i++],
-                                        pri->ibuf, &pri->pos, &pri->esc);
-                        if(size){
-                                memcpy(buf, pri->ibuf, size);
-                                memmove(pri->ibuf, &pri->ibuf[i], pri->more-i);
-                                pri->more=pri->more-i; 
-                                return(size);
-                        }
-                }
-                pri->more=0;
-        }
-
-        n = net_read(fd, &pri->ibuf[pri->pos], sizeof(pri->ibuf) - pri->pos);
-        if(n <= 0) return(n);
-
-        start = pri->pos;
-        for(i = 0; i < n; i++){
-                size = slip_unesc(pri->ibuf[start + i],
-                                pri->ibuf, &pri->pos, &pri->esc);
-                if(size){
-                        memcpy(buf, pri->ibuf, size);
-                        memmove(pri->ibuf, &pri->ibuf[start+i+1], n-(i+1));
-                        pri->more=n-(i+1); 
-                        return(size);
-                }
-        }
-        return(0);
+        return slip_proto_read(fd, buf, len, &pri->slip);
 }
 
 int slip_user_write(int fd, void *buf, int len, struct slip_data *pri)
 {
-        int actual, n;
-
-        actual = slip_esc(buf, pri->obuf, len);
-        n = net_write(fd, pri->obuf, actual);
-        if(n < 0) return(n);
-        else return(len);
+        return slip_proto_write(fd, buf, len, &pri->slip);
 }
 
 static int slip_set_mtu(int mtu, void *data)
@@ -267,14 +252,3 @@ struct net_user_info slip_user_info = {
         .delete_address = slip_del_addr,
         .max_packet     = BUF_SIZE
 };
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/drivers/slirp.h b/arch/um/drivers/slirp.h
index afa4e30284fd..6cf88ab580c9 100644
--- a/arch/um/drivers/slirp.h
+++ b/arch/um/drivers/slirp.h
@@ -1,10 +1,7 @@
 #ifndef __UM_SLIRP_H
 #define __UM_SLIRP_H
 
-#define BUF_SIZE 1500
- /* two bytes each for a (pathological) max packet of escaped chars +  * 
-  * terminating END char + initial END char                            */
-#define ENC_BUF_SIZE (2 * BUF_SIZE + 2)
+#include "slip_common.h"
 
 #define SLIRP_MAX_ARGS 100
 /*
@@ -24,28 +21,13 @@ struct slirp_data {
         struct arg_list_dummy_wrapper argw;
         int pid;
         int slave;
-        unsigned char ibuf[ENC_BUF_SIZE];
-        unsigned char obuf[ENC_BUF_SIZE];
-        int more; /* more data: do not read fd until ibuf has been drained */
-        int pos;
-        int esc;
+        struct slip_proto slip;
 };
 
 extern struct net_user_info slirp_user_info;
 
-extern int set_umn_addr(int fd, char *addr, char *ptp_addr);
 extern int slirp_user_read(int fd, void *buf, int len, struct slirp_data *pri);
-extern int slirp_user_write(int fd, void *buf, int len, struct slirp_data *pri);
+extern int slirp_user_write(int fd, void *buf, int len,
+                            struct slirp_data *pri);
 
 #endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index c9d6b52a831d..9864d27afdbe 100644
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
@@ -25,10 +25,7 @@ void slirp_init(struct net_device *dev, void *data)
                 { .argw         = init->argw,
                   .pid          = -1,
                   .slave        = -1,
-                  .ibuf         = { '\0' },
-                  .obuf         = { '\0' },
-                  .pos          = 0,
-                  .esc          = 0,
+                  .slip         = SLIP_PROTO_INIT,
                   .dev          = dev });
 
         dev->init = NULL;
diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index c322515c71cc..8d91f663d82c 100644
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -12,7 +12,7 @@
 #include "user.h"
 #include "net_user.h"
 #include "slirp.h"
-#include "slip_proto.h"
+#include "slip_common.h"
 #include "helper.h"
 #include "os.h"
 
@@ -48,47 +48,32 @@ static int slirp_tramp(char **argv, int fd)
         return(pid);
 }
 
-/* XXX This is just a trivial wrapper around os_pipe */
-static int slirp_datachan(int *mfd, int *sfd)
-{
-        int fds[2], err;
-
-        err = os_pipe(fds, 1, 1);
-        if(err < 0){
-                printk("slirp_datachan: Failed to open pipe, err = %d\n", -err);
-                return(err);
-        }
-
-        *mfd = fds[0];
-        *sfd = fds[1];
-        return(0);
-}
-
 static int slirp_open(void *data)
 {
         struct slirp_data *pri = data;
-        int sfd, mfd, pid, err;
+        int fds[2], pid, err;
 
-        err = slirp_datachan(&mfd, &sfd);
+        err = os_pipe(fds, 1, 1);
         if(err)
                 return(err);
 
-        pid = slirp_tramp(pri->argw.argv, sfd);
-
-        if(pid < 0){
-                printk("slirp_tramp failed - errno = %d\n", -pid);
-                os_close_file(sfd);     
-                os_close_file(mfd);     
-                return(pid);
+        err = slirp_tramp(pri->argw.argv, fds[1]);
+        if(err < 0){
+                printk("slirp_tramp failed - errno = %d\n", -err);
+                goto out;
         }
-
-        pri->slave = sfd;
-        pri->pos = 0;
-        pri->esc = 0;
-
-        pri->pid = pid;
-
-        return(mfd);
+        pid = err;
+
+        pri->slave = fds[1];
+        pri->slip.pos = 0;
+        pri->slip.esc = 0;
+        pri->pid = err;
+
+        return(fds[0]);
+out:
+        os_close_file(fds[0]);
+        os_close_file(fds[1]);
+        return err;
 }
 
 static void slirp_close(int fd, void *data)
@@ -129,48 +114,12 @@ static void slirp_close(int fd, void *data)
 
 int slirp_user_read(int fd, void *buf, int len, struct slirp_data *pri)
 {
-        int i, n, size, start;
-
-        if(pri->more>0) {
-                i = 0;
-                while(i < pri->more) {
-                        size = slip_unesc(pri->ibuf[i++],
-                                        pri->ibuf,&pri->pos,&pri->esc);
-                        if(size){
-                                memcpy(buf, pri->ibuf, size);
-                                memmove(pri->ibuf, &pri->ibuf[i], pri->more-i);
-                                pri->more=pri->more-i; 
-                                return(size);
-                        }
-                }
-                pri->more=0;
-        }
-
-        n = net_read(fd, &pri->ibuf[pri->pos], sizeof(pri->ibuf) - pri->pos);
-        if(n <= 0) return(n);
-
-        start = pri->pos;
-        for(i = 0; i < n; i++){
-                size = slip_unesc(pri->ibuf[start + i],
-                                pri->ibuf,&pri->pos,&pri->esc);
-                if(size){
-                        memcpy(buf, pri->ibuf, size);
-                        memmove(pri->ibuf, &pri->ibuf[start+i+1], n-(i+1));
-                        pri->more=n-(i+1); 
-                        return(size);
-                }
-        }
-        return(0);
+        return slip_proto_read(fd, buf, len, &pri->slip);
 }
 
 int slirp_user_write(int fd, void *buf, int len, struct slirp_data *pri)
 {
-        int actual, n;
-
-        actual = slip_esc(buf, pri->obuf, len);
-        n = net_write(fd, pri->obuf, actual);
-        if(n < 0) return(n);
-        else return(len);
+        return slip_proto_write(fd, buf, len, &pri->slip);
 }
 
 static int slirp_set_mtu(int mtu, void *data)
@@ -188,14 +137,3 @@ struct net_user_info slirp_user_info = {
         .delete_address = NULL,
         .max_packet     = BUF_SIZE
 };
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */