V1.10

New feature(s):
- Network stack
- Piping commands into a udpsend message
Bug fix(es):
-N/A

src/kernel/cli_apps/about.c

@@ -2,6 +2,6 @@
 
 void cli_cmd_brewver(char *args) {
     (void)args;
-    cli_write("BrewOS v1.03 Alpha\n");
-    cli_write("BrewOS Kernel V2.0.3 Pre-Alpha\n");
+    cli_write("BrewOS v1.10 Alpha\n");
+    cli_write("BrewOS Kernel V2.1.0 Pre-Alpha\n");
 }

src/kernel/cli_apps/cli_apps.h

@@ -37,4 +37,14 @@ void cli_cmd_memblock(char *args);
 void cli_cmd_memvalid(char *args);
 void cli_cmd_memtest(char *args);
 
+// Network commands
+void cli_cmd_netinit(char *args);
+void cli_cmd_netinfo(char *args);
+void cli_cmd_ipset(char *args);
+void cli_cmd_udpsend(char *args);
+void cli_cmd_udptest(char *args);
+
+// PCI commands
+void cli_cmd_pcilist(char *args);
+
 #endif

src/kernel/cli_apps/net.c

@@ -0,0 +1,112 @@
+#include "cli_utils.h"
+#include "network.h"
+
+static void print_mac(const mac_address_t* mac){
+    char buf[64];
+    int p=0;
+    for(int i=0;i<6;i++){
+        int v=mac->bytes[i];
+        int hi=(v>>4)&0xF, lo=v&0xF;
+        buf[p++]= (hi<10)?('0'+hi):('A'+(hi-10));
+        buf[p++]= (lo<10)?('0'+lo):('A'+(lo-10));
+        if(i<5) buf[p++]=':';
+    }
+    buf[p]=0;
+    cli_write(buf);
+}
+
+void cli_cmd_netinit(char *args){
+    (void)args;
+    int r=network_init();
+    if(r==0){
+        cli_write("Network initialized\n");
+        int d=network_dhcp_acquire();
+        if(d==0){
+            cli_write("DHCP acquired\n");
+        } else {
+            cli_write("DHCP failed\n");
+        }
+    } else {
+        cli_write("Network init failed\n");
+    }
+}
+
+void cli_cmd_netinfo(char *args){
+    (void)args;
+    mac_address_t mac;
+    ipv4_address_t ip;
+    if(network_get_mac_address(&mac)==0){
+        cli_write("MAC: "); print_mac(&mac); cli_write("\n");
+    }
+    if(network_get_ipv4_address(&ip)==0){
+        cli_write("IP: ");
+        for(int i=0;i<4;i++){ cli_write_int(ip.bytes[i]); if(i<3) cli_write("."); }
+        cli_write("\n");
+    }
+    cli_write("Frames: "); cli_write_int(network_get_frames_received()); cli_write("\n");
+    cli_write("UDP packets: "); cli_write_int(network_get_udp_packets_received()); cli_write("\n");
+    cli_write("UDP callbacks: "); cli_write_int(network_get_udp_callbacks_called()); cli_write("\n");
+    cli_write("E1000 receive calls: "); cli_write_int(network_get_e1000_receive_calls()); cli_write("\n");
+    cli_write("E1000 receive empty: "); cli_write_int(network_get_e1000_receive_empty()); cli_write("\n");
+    cli_write("Process calls: "); cli_write_int(network_get_process_calls()); cli_write("\n");
+}
+
+void cli_cmd_ipset(char *args){
+    if(!args||!*args){ cli_write("Usage: IPSET a.b.c.d\n"); return; }
+    ipv4_address_t ip={{0,0,0,0}};
+    int part=0; int val=0; int i=0;
+    while(args[i]){
+        char ch=args[i++];
+        if(ch>='0'&&ch<='9'){ val=val*10+(ch-'0'); if(val>255){ cli_write("Invalid IP\n"); return; } }
+        else if(ch=='.'){ if(part>3){ cli_write("Invalid IP\n"); return; } ip.bytes[part++]=(uint8_t)val; val=0; }
+        else { cli_write("Invalid IP\n"); return; }
+    }
+    if(part!=3){ cli_write("Invalid IP\n"); return; }
+    ip.bytes[3]=(uint8_t)val;
+    if(network_set_ipv4_address(&ip)==0){ cli_write("IP set\n"); } else { cli_write("IP set failed\n"); }
+}
+
+void cli_cmd_udpsend(char *args){
+    if(!args||!*args){ cli_write("Usage: UDPSEND ip port data\n"); return; }
+    char ipstr[32]; int pos=0;
+    while(args[pos] && args[pos]!=' '){ ipstr[pos]=args[pos]; pos++; }
+    ipstr[pos]=0;
+    while(args[pos]==' ') pos++;
+    char portstr[16]; int p=0;
+    while(args[pos] && args[pos]!=' '){ portstr[p++]=args[pos++]; }
+    portstr[p]=0;
+    while(args[pos]==' ') pos++;
+    char* datastr = args+pos;
+    ipv4_address_t ip={{0,0,0,0}};
+    int idx=0; int val=0; int j=0;
+    while(ipstr[j]){
+        char ch=ipstr[j++];
+        if(ch>='0'&&ch<='9'){ val=val*10+(ch-'0'); if(val>255){ cli_write("Invalid IP\n"); return; } }
+        else if(ch=='.'){ if(idx>3){ cli_write("Invalid IP\n"); return; } ip.bytes[idx++]=(uint8_t)val; val=0; }
+        else { cli_write("Invalid IP\n"); return; }
+    }
+    if(idx!=3){ cli_write("Invalid IP\n"); return; }
+    ip.bytes[3]=(uint8_t)val;
+    int port=0; int k=0; while(portstr[k]){ char ch=portstr[k++]; if(ch<'0'||ch>'9'){ cli_write("Invalid port\n"); return; } port=port*10+(ch-'0'); }
+    if(port<=0||port>65535){ cli_write("Invalid port\n"); return; }
+    int len=(int)cli_strlen(datastr);
+    if(len<=0){ cli_write("No data\n"); return; }
+    int r=udp_send_packet(&ip,(uint16_t)port,12345,datastr,(size_t)len);
+    if(r==0) cli_write("Sent\n"); else cli_write("Send failed\n");
+}
+
+static void udp_print_callback(const ipv4_address_t* src_ip,uint16_t src_port,const mac_address_t* src_mac,const void* data,size_t length){
+    (void)src_mac;
+    cli_write("UDP from ");
+    for(int i=0;i<4;i++){ cli_write_int(src_ip->bytes[i]); if(i<3) cli_write("."); }
+    cli_write(":"); cli_write_int(src_port); cli_write(" ");
+    for(size_t i=0;i<length;i++){ cli_putchar(((const char*)data)[i]); }
+    cli_write("\n");
+}
+
+void cli_cmd_udptest(char *args){
+    if(!args||!*args){ cli_write("Usage: UDPTEST port\n"); return; }
+    int port=cli_atoi(args);
+    if(port<=0||port>65535){ cli_write("Invalid port\n"); return; }
+    if(udp_register_callback((uint16_t)port,udp_print_callback)==0) cli_write("UDP callback registered\n"); else cli_write("Register failed\n");
+}

src/kernel/cli_apps/pci_list.c

@@ -0,0 +1,44 @@
+#include "cli_utils.h"
+#include "pci.h"
+
+static void print_hex16(uint16_t v){
+    char buf[7]; buf[0]='0'; buf[1]='x';
+    for(int i=0;i<4;i++){
+        int nyb=(v >> ((3-i)*4)) & 0xF;
+        buf[2+i]= nyb<10?('0'+nyb):('A'+(nyb-10));
+    }
+    buf[6]=0;
+    cli_write(buf);
+}
+
+static void print_hex8(uint8_t v){
+    char buf[5]; buf[0]='0'; buf[1]='x';
+    int hi=(v>>4)&0xF, lo=v&0xF;
+    buf[2]= hi<10?('0'+hi):('A'+(hi-10));
+    buf[3]= lo<10?('0'+lo):('A'+(lo-10));
+    buf[4]=0;
+    cli_write(buf);
+}
+
+void cli_cmd_pcilist(char *args){
+    (void)args;
+    pci_device_t devs[64];
+    int n=pci_enumerate_devices(devs,64);
+    cli_write("PCI devices:\n");
+    for(int i=0;i<n;i++){
+        cli_write(" ");
+        cli_write_int(devs[i].bus); cli_write(":");
+        cli_write_int(devs[i].device); cli_write(".");
+        cli_write_int(devs[i].function); cli_write("  ");
+        cli_write("vendor="); print_hex16(devs[i].vendor_id); cli_write(" ");
+        cli_write("device="); print_hex16(devs[i].device_id); cli_write(" ");
+        cli_write("class="); print_hex8(devs[i].class_code); cli_write(" ");
+        cli_write("subclass="); print_hex8(devs[i].subclass); cli_write(" ");
+        cli_write("prog_if="); print_hex8(devs[i].prog_if);
+        if(devs[i].vendor_id==0x8086 && devs[i].device_id==0x100E){
+            cli_write("  [e1000]");
+        }
+        cli_write("\n");
+    }
+    cli_write_int(n); cli_write(" device(s)\n");
+}