# HG changeset patch
# User epoch <epoch@hacking.allowed.ano>
# Date 1454986992 0
# Node ID 97ed67f3a20d8dcfc5f0ea70b50d5a6ac701fcd3
# Parent  80f04024e95994eaaf0c0678577f1615ed2430c1
changed some ns stuff. added ice's resources. some leftover files from playing with marc.c

diff -r 80f04024e959 -r 97ed67f3a20d contrib/marc/marc
Binary file contrib/marc/marc has changed
diff -r 80f04024e959 -r 97ed67f3a20d contrib/marc/marc.c
--- a/contrib/marc/marc.c	Thu Oct 22 21:58:27 2015 +0200
+++ b/contrib/marc/marc.c	Tue Feb 09 03:03:12 2016 +0000
@@ -9,6 +9,9 @@
 #define M_TYPE_LIST 2
 #define M_TYPE_DICT 3
 
+//extension?
+#define M_TYPE_TRANSFERCHAIN 5
+
 char *type[]={"NULL","string","list","dict"};
 
 int indent;
@@ -20,13 +23,24 @@
  }
 }
 
+void printpercent(unsigned char *data,int length) {
+ for(;length;data++,length--) {
+  if(isprint(*data)) printf("%c",*data);
+  else {
+//   printf("%%%c%c","0123456789abcdef"[(*data-'0')>>4&15],"0123456789abcdef"[(*data-'0')&15]);
+   printf("%%%02x",*data);
+//"0123456789abcdef"[(*data-'0')>>4&15],"0123456789abcdef"[(*data-'0')&15]);
+  }
+ }
+}
+
 int marc_decode(unsigned char *data,int from_index,int length) {
- char *s;
+ unsigned char *s;
  unsigned int cur_len=0;
  unsigned char m_type=data[from_index];
  from_index++;
  char *key;
- if(!length) return printf("dafuq? no length???"),-1;
+ if(!length) return printf("what the fuck? no length???"),-1;
  pi();
  printf("length: %d\n",length);
  pi();
@@ -38,7 +52,9 @@
    s=malloc(length);
    memcpy(s,data+from_index,length-1);
    s[length-1]=0;
-   printf("string: %s\n",s);
+   printf("string: ");
+   printpercent(s,length);
+   printf("\n");
    break;
   case M_TYPE_LIST:
    printf("list:\n");
@@ -75,8 +91,14 @@
    }
    indent--;
    break;
+  /*case M_TYPE_TRANSFERCHAIN:
+   s=malloc(length);
+   memcpy(s,data+from_index,length-1);
+   s[length-1]=0;
+   printf("transfer: %s\n",s);
+   break;*/
   default:
-   printf("oh fuck. dahell is this!?!? %d\n",m_type);
+   printf("oh fuck. dahell is this!?!? mtype of %d!?!?\n",m_type);
    break;
  }
  return 0;
@@ -89,7 +111,7 @@
 }
 
 void update_message_decode(unsigned char *data,int from_index,int length) {
- printf("update_message version: %d len: %d\n",data[from_index],length);
+ printf("\nupdate_message version: %d len: %d\n",data[from_index],length);
  if(data[from_index] != 2) return printf("this program only handles version 2 update messages.\n");
  from_index++;
  char pkey[32];
@@ -135,7 +157,10 @@
    from_index+=2;
    from_index+=ext_data_len;//skip this for now... fuck it.
    printf("  ext %d type: %d len: %d\n",i,ext_type,ext_data_len);
-   if(ext_type != 1 && ext_type != 4) return printf("fuckfuckfuckfuck...\n"),0;
+   if(ext_type != 1 && ext_type != 4 && ext_type != 5) {//let's pretend 5 is transfer chain?
+    printf("fuck. unknown ext_type: %d @ %d\n",ext_type,from_index);
+    return;
+   }
   }
   marc_decode(data+from_index,0,length);
  //}
diff -r 80f04024e959 -r 97ed67f3a20d contrib/marc/marcdb
Binary file contrib/marc/marcdb has changed
diff -r 80f04024e959 -r 97ed67f3a20d db/as/187/desc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/187/desc	Tue Feb 09 03:03:12 2016 +0000
@@ -0,0 +1,1 @@
+Murdernet
diff -r 80f04024e959 -r 97ed67f3a20d db/as/187/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/187/owner	Tue Feb 09 03:03:12 2016 +0000
@@ -0,0 +1,1 @@
+epoch
diff -r 80f04024e959 -r 97ed67f3a20d db/as/7672/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/7672/owner	Tue Feb 09 03:03:12 2016 +0000
@@ -0,0 +1,1 @@
+ice
diff -r 80f04024e959 -r 97ed67f3a20d db/ip/01/4C/48/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/4C/48/cidr	Tue Feb 09 03:03:12 2016 +0000
@@ -0,0 +1,1 @@
+1.76.72.0/24
diff -r 80f04024e959 -r 97ed67f3a20d db/ip/01/4C/48/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/4C/48/owner	Tue Feb 09 03:03:12 2016 +0000
@@ -0,0 +1,1 @@
+ice
diff -r 80f04024e959 -r 97ed67f3a20d db/usr/ice/irc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/ice/irc	Tue Feb 09 03:03:12 2016 +0000
@@ -0,0 +1,1 @@
+ice in #default on hacking.allowed.ano