Changeset 1204

Timestamp:

03/04/10 08:19:24 (5 months ago)

Author:

Gary

Message:

unxsBind started support for AAAA RRs save commit not stable!

Location:

trunk/unxsBind

Files:

• mysqlrad.h (modified) (1 diff)
• tresourcefunc.h (modified) (11 diffs)
• trrtype.c (modified) (16 diffs)

trunk/unxsBind/mysqlrad.h

@@ -25 +25 @@
 #include <mysql/mysql.h>
 char *crypt(const char *key, const char *salt);
+
+//This creates a dependency on provided tRRType.txt table fie
+#define RRTYPE_A 1
+#define RRTYPE_NS 2
+#define RRTYPE_MX 3 
+#define RRTYPE_HINFO 4
+#define RRTYPE_CNAME 5
+#define RRTYPE_TXT 6
+#define RRTYPE_PTR 7
+#define RRTYPE_SRV 8
+#define RRTYPE_AAAA 9
 
 

trunk/unxsBind/tresourcefunc.h

@@ -198 +198 @@
                 }
         }
+        else if(!strcmp(cRRType,"AAAA"))
+        {
+                unsigned h1=0;
+                unsigned h2=0;
+                unsigned h3=0;
+                unsigned h4=0;
+                unsigned h5=0;
+                unsigned h6=0;
+                unsigned h7=0;
+                unsigned h8=0;
+
+                //Insure these are empty
+                cParam2[0]=0;
+
+                if(!strcmp(cZone+strlen(cZone)-5,".arpa"))
+                        tResource("Can not add AAAA records to arpa zones");
+                sscanf(cParam1,"%x:%x:%x:%x:%x:%x:%x:%x",&h1,&h2,&h3,&h4,&h5,&h6,&h7,&h8);
+
+                //Leading 0's. Done via sprintf below.
+
+                //First checks
+                if(!h1)
+                {
+                        guMode=uMode;
+                        tResource("IPv6 number can not have a 0 in first 16 bit hex word.");
+                }
+
+                if(!h8)
+                {
+                        guMode=uMode;
+                        tResource("IPv6 number can not have a 0 in last 16 bit hex word.");
+                }
+
+                //Compress empty words: Double colon. Can only be used once.
+                //Trying KISS method here
+                //6 consecutive 0 case
+                if(!h2 && !h3 && !h4 && !h5 && !h6 && !h7)
+                        sprintf(cParam1,"%x::%x",h1,h8);
+                //5 consecutive 0 cases
+                else if(!h3 && !h4 && !h5 && !h6 && !h7)
+                        sprintf(cParam1,"%x:%x::%x",h1,h2,h8);
+                else if(!h2 && !h3 && !h4 && !h5 && !h6)
+                        sprintf(cParam1,"%x::%x:%x",h1,h7,h8);
+                //4 consecutive 0 cases
+                else if(!h4 && !h5 && !h6 && !h7)
+                        sprintf(cParam1,"%x:%x:%x::%x",h1,h2,h3, h8);
+                else if(!h3 && !h4 && !h5 && !h6)
+                        sprintf(cParam1,"%x:%x::%x:%x",h1,h2, h7,h8);
+                else if(!h2 && !h3 && !h4 && !h5)
+                        sprintf(cParam1,"%x::%x:%x:%x",h1, h6,h7,h8);
+                //3 consecutive 0 cases
+                else if(!h5 && !h6 && !h7)
+                        sprintf(cParam1,"%x:%x:%x:%x::%x",h1,h2,h3,h4, h8);
+                else if(!h4 && !h5 && !h6)
+                        sprintf(cParam1,"%x:%x:%x::%x:%x",h1,h2,h3, h7,h8);
+                else if(!h3 && !h4 && !h5)
+                        sprintf(cParam1,"%x:%x::%x:%x:%x",h1,h2, h6,h7,h8);
+                else if(!h2 && !h3 && !h4)
+                        sprintf(cParam1,"%x::%x:%x:%x:%x",h1, h5,h6,h7,h8);
+                //2 consecutive 0 cases
+                else if(!h6 && !h7)
+                        sprintf(cParam1,"%x:%x:%x:%x:%x::%x",h1,h2,h3,h4,h5, h8);
+                else if(!h5 && !h6)
+                        sprintf(cParam1,"%x:%x:%x:%x::%x:%x",h1,h2,h3,h4, h7,h8);
+                else if(!h4 && !h5)
+                        sprintf(cParam1,"%x:%x:%x::%x:%x:%x",h1,h2,h3, h6,h7,h8);
+                else if(!h3 && !h4)
+                        sprintf(cParam1,"%x:%x::%x:%x:%x:%x",h1,h2, h5,h6,h7,h8);
+                else if(!h2 && !h3)
+                        sprintf(cParam1,"%x::%x:%x:%x:%x:%x",h1, h4,h5,h6,h7,h8);
+                //0 consecutive 0 case, i.e. no double colon case
+                else if(1)
+                        sprintf(cParam1,"%x:%x:%x:%x:%x:%x:%x:%x",h1,h2,h3,h4,h5,h6,h7,h8);
+                
+
+        }
         else if(!strcmp(cRRType,"PTR"))
         {
@@ -429 +505 @@
                                 //New PTR record in automated arpa zones
                                 //exception allowed
-                                if(!uZoneOwner && uRRType!=7)
+                                if(!uZoneOwner && uRRType!=RRTYPE_PTR)
                                 {
                                         guMode=0;
@@ -440 +516 @@
                                 uModBy=0;//Never modified
                                 
-                                if(uAddArpaPTR && uRRType==1)
+                                if(uAddArpaPTR && uRRType==RRTYPE_A)
                                 {
                                         char cFQDN[512];
@@ -508 +584 @@
                                 UpdateSerialNum(uZone);                         
                                 sprintf(gcQuery,"INSERT INTO tDeletedResource SET uDeletedResource='%u',uZone='%u',"
-                                                "cName='%s',uTTL='%u',uRRType='%u',cParam1='%s',cParam2='%s',cParam3='%s',cParam4='%s',"
+                                                "cName='%s',uTTL='%u',uRRType='%u',cParam1='%s',cParam2='%s',"
+                                                "cParam3='%s',cParam4='%s',"
                                                 "cComment='%s',uOwner='%u',uCreatedBy=1,uCreatedDate=UNIX_TIMESTAMP(NOW())",
                                                 uResource,
@@ -550 +627 @@
                                 RRCheck(2002);
                                 uModBy=guLoginClient;
-                                if(uAddArpaPTR && uRRType==1)
+                                if(uAddArpaPTR && uRRType==RRTYPE_A)
                                 {
                                         char cFQDN[512];
@@ -656 +733 @@
                                         {
                                                 sprintf(gcQuery,"INSERT INTO tResource SET uZone=%u,cName='%.99s',"
-                                                                "uRRType=2,cParam1='%.99s.',"
+                                                                "uRRType=%u,cParam1='%.99s.',"
                                                                 "cComment='DelegationWizard created',uOwner=%u,"
                                                                 "uCreatedDate=UNIX_TIMESTAMP(NOW())",
                                                                 uZone
                                                                 ,cZone
+                                                                ,RRTYPE_NS
                                                                 ,cNSSet[i]
                                                                 ,guLoginClient);
@@ -680 +758 @@
                                         sprintf(cParam1,"%u-%u",uStartBlock,uNumIPs-1);
                                         sprintf(gcQuery,"INSERT INTO tResource SET uZone=%u,cName='%.15s',"
-                                                        "uRRType=2,cParam1='%.99s.'"
+                                                        "uRRType=%u,cParam1='%.99s.'"
                                                         ",cComment='DelegationWizard created',uOwner=%u,"
                                                         "uCreatedDate=UNIX_TIMESTAMP(NOW())",
                                                         uZone
                                                         ,cParam1
+                                                        ,RRTYPE_NS
                                                         ,cNSSet[i]
                                                         ,guLoginClient);
@@ -803 +882 @@
                         printf("<p><u>Enter required data</u><br>");
                         printf(LANG_NBB_CONFIRMNEW);
-                        if(strcmp(cZone+strlen(cZone)-5,".arpa"))
+                        if(uRRType==RRTYPE_A && strcmp(cZone+strlen(cZone)-5,".arpa"))
                         {
                                 printf("<br><input title='For some RR types this will add a PTR entry to"
@@ -829 +908 @@
                         printf("<p><u>Review record data</u><br>");
                         printf(LANG_NBB_CONFIRMMOD);
-                        if(uRRType==1 && strcmp(cZone+strlen(cZone)-5,".arpa"))
+                        if(uRRType==RRTYPE_A && strcmp(cZone+strlen(cZone)-5,".arpa"))
                         {
                                 printf("<br><input title='For some RR types this will add a PTR entry to"
@@ -1114 +1193 @@
         //Only allow one PTR entry per FQDN for same uOwner
 
-        sprintf(gcQuery,"DELETE FROM tResource WHERE uRRType=7 AND cParam1='%s' AND uOwner=%u",
-                        cParam1,uSourceZoneOwner);
+        sprintf(gcQuery,"DELETE FROM tResource WHERE uRRType=%u AND cParam1='%s' AND uOwner=%u",
+                                RRTYPE_PTR,cParam1,uSourceZoneOwner);
         mysql_query(&gMysql,gcQuery);
         if(mysql_errno(&gMysql)) 
@@ -1125 +1204 @@
 
         sprintf(cName,"%u",d);
-        sprintf(gcQuery,"INSERT INTO tResource SET uZone=%u,cName='%.16s',uRRType=7,cParam1='%.511s',cComment='%.99s',"
+        sprintf(gcQuery,"INSERT INTO tResource SET uZone=%u,cName='%.16s',uRRType=%u,cParam1='%.511s',cComment='%.99s',"
                         "uOwner=%u,uCreatedBy=%u,uCreatedDate=UNIX_TIMESTAMP(NOW())",
                                 uInZone
                                 ,cName
+                                ,RRTYPE_PTR
                                 ,cParam1
                                 ,cComment

trunk/unxsBind/trrtype.c

@@ -387 +387 @@
 //cLabel
         OpenRow(LANG_FL_tRRType_cLabel,"black");
-        printf("<input title='%s' type=text name=cLabel value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cLabel value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cLabel,EncodeDoubleQuotes(cLabel));
         if(guPermLevel>=0 && uMode)
@@ -412 +412 @@
 //cParam1Func
         OpenRow(LANG_FL_tRRType_cParam1Func,"black");
-        printf("<input title='%s' type=text name=cParam1Func value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cParam1Func value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cParam1Func,EncodeDoubleQuotes(cParam1Func));
         if(guPermLevel>=0 && uMode)
@@ -425 +425 @@
 //cParam2Func
         OpenRow(LANG_FL_tRRType_cParam2Func,"black");
-        printf("<input title='%s' type=text name=cParam2Func value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cParam2Func value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cParam2Func,EncodeDoubleQuotes(cParam2Func));
         if(guPermLevel>=0 && uMode)
@@ -438 +438 @@
 //cParam3Func
         OpenRow(LANG_FL_tRRType_cParam3Func,"black");
-        printf("<input title='%s' type=text name=cParam3Func value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cParam3Func value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cParam3Func,EncodeDoubleQuotes(cParam3Func));
         if(guPermLevel>=0 && uMode)
@@ -451 +451 @@
 //cParam4Func
         OpenRow(LANG_FL_tRRType_cParam4Func,"black");
-        printf("<input title='%s' type=text name=cParam4Func value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cParam4Func value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cParam4Func,EncodeDoubleQuotes(cParam4Func));
         if(guPermLevel>=0 && uMode)
@@ -464 +464 @@
 //cParam1Label
         OpenRow(LANG_FL_tRRType_cParam1Label,"black");
-        printf("<input title='%s' type=text name=cParam1Label value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cParam1Label value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cParam1Label,EncodeDoubleQuotes(cParam1Label));
         if(guPermLevel>=0 && uMode)
@@ -477 +477 @@
 //cParam2Label
         OpenRow(LANG_FL_tRRType_cParam2Label,"black");
-        printf("<input title='%s' type=text name=cParam2Label value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cParam2Label value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cParam2Label,EncodeDoubleQuotes(cParam2Label));
         if(guPermLevel>=0 && uMode)
@@ -490 +490 @@
 //cParam3Label
         OpenRow(LANG_FL_tRRType_cParam3Label,"black");
-        printf("<input title='%s' type=text name=cParam3Label value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cParam3Label value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cParam3Label,EncodeDoubleQuotes(cParam3Label));
         if(guPermLevel>=0 && uMode)
@@ -503 +503 @@
 //cParam4Label
         OpenRow(LANG_FL_tRRType_cParam4Label,"black");
-        printf("<input title='%s' type=text name=cParam4Label value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cParam4Label value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cParam4Label,EncodeDoubleQuotes(cParam4Label));
         if(guPermLevel>=0 && uMode)
@@ -516 +516 @@
 //cParam1Tip
         OpenRow(LANG_FL_tRRType_cParam1Tip,"black");
-        printf("<input title='%s' type=text name=cParam1Tip value=\"%s\" size=40 maxlength=100 "
+        printf("<input title='%s' type=text name=cParam1Tip value=\"%s\" size=60 maxlength=100 "
 ,LANG_FT_tRRType_cParam1Tip,EncodeDoubleQuotes(cParam1Tip));
         if(guPermLevel>=0 && uMode)
@@ -529 +529 @@
 //cParam2Tip
         OpenRow(LANG_FL_tRRType_cParam2Tip,"black");
-        printf("<input title='%s' type=text name=cParam2Tip value=\"%s\" size=40 maxlength=100 "
+        printf("<input title='%s' type=text name=cParam2Tip value=\"%s\" size=60 maxlength=100 "
 ,LANG_FT_tRRType_cParam2Tip,EncodeDoubleQuotes(cParam2Tip));
         if(guPermLevel>=0 && uMode)
@@ -542 +542 @@
 //cParam3Tip
         OpenRow(LANG_FL_tRRType_cParam3Tip,"black");
-        printf("<input title='%s' type=text name=cParam3Tip value=\"%s\" size=40 maxlength=100 "
+        printf("<input title='%s' type=text name=cParam3Tip value=\"%s\" size=60 maxlength=100 "
 ,LANG_FT_tRRType_cParam3Tip,EncodeDoubleQuotes(cParam3Tip));
         if(guPermLevel>=0 && uMode)
@@ -555 +555 @@
 //cParam4Tip
         OpenRow(LANG_FL_tRRType_cParam4Tip,"black");
-        printf("<input title='%s' type=text name=cParam4Tip value=\"%s\" size=40 maxlength=100 "
+        printf("<input title='%s' type=text name=cParam4Tip value=\"%s\" size=60 maxlength=100 "
 ,LANG_FT_tRRType_cParam4Tip,EncodeDoubleQuotes(cParam4Tip));
         if(guPermLevel>=0 && uMode)
@@ -586 +586 @@
 //cNameFunc
         OpenRow(LANG_FL_tRRType_cNameFunc,"black");
-        printf("<input title='%s' type=text name=cNameFunc value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cNameFunc value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cNameFunc,EncodeDoubleQuotes(cNameFunc));
         if(guPermLevel>=0 && uMode)
@@ -599 +599 @@
 //cNameLabel
         OpenRow(LANG_FL_tRRType_cNameLabel,"black");
-        printf("<input title='%s' type=text name=cNameLabel value=\"%s\" size=40 maxlength=32 "
+        printf("<input title='%s' type=text name=cNameLabel value=\"%s\" size=60 maxlength=32 "
 ,LANG_FT_tRRType_cNameLabel,EncodeDoubleQuotes(cNameLabel));
         if(guPermLevel>=0 && uMode)
@@ -612 +612 @@
 //cNameTip
         OpenRow(LANG_FL_tRRType_cNameTip,"black");
-        printf("<input title='%s' type=text name=cNameTip value=\"%s\" size=40 maxlength=100 "
+        printf("<input title='%s' type=text name=cNameTip value=\"%s\" size=60 maxlength=100 "
 ,LANG_FT_tRRType_cNameTip,EncodeDoubleQuotes(cNameTip));
         if(guPermLevel>=0 && uMode)