Diff of /trunk/1.8.x/ccs-patch/security/ccsecurity/network.c

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/trunk/1.8.x/ccs-patch/security/ccsecurity/network.c




Diff of /trunk/1.8.x/ccs-patch/security/ccsecurity/network.c



 Parent Directory

|  Revision Log



|  Patch














revision 3691 by kumaneko,
Sun May 23 03:22:24 2010 UTC




revision 3693 by kumaneko,
Sun May 23 08:05:44 2010 UTC






#

Line 276 
 static int ccs_network_entry(const bool


Line 276 
 static int ccs_network_entry(const bool












276
         return error;
         return error;

















277
 }
 }

















278
 
 















279


 static bool ccs_is_same_ip_network_acl(const struct ccs_acl_info *a,


 static bool ccs_same_ip_network_acl(const struct ccs_acl_info *a,















280
                                        const struct ccs_acl_info *b)
                                        const struct ccs_acl_info *b)

















281
 {
 {

















282
         const struct ccs_ip_network_acl *p1 = container_of(a, typeof(*p1),
         const struct ccs_ip_network_acl *p1 = container_of(a, typeof(*p1),

















283
                                                            head);
                                                            head);

















284
         const struct ccs_ip_network_acl *p2 = container_of(b, typeof(*p2),
         const struct ccs_ip_network_acl *p2 = container_of(b, typeof(*p2),

















285
                                                            head);
                                                            head);















286


         return ccs_is_same_acl_head(&p1->head, &p2->head)


         return ccs_same_acl_head(&p1->head, &p2->head)















287
                 && p1->address_type == p2->address_type &&
                 && p1->address_type == p2->address_type &&

















288
                 p1->address.ipv4.min == p2->address.ipv4.min &&
                 p1->address.ipv4.min == p2->address.ipv4.min &&

















289
                 p1->address.ipv6.min == p2->address.ipv6.min &&
                 p1->address.ipv6.min == p2->address.ipv6.min &&

















290
                 p1->address.ipv4.max == p2->address.ipv4.max &&
                 p1->address.ipv4.max == p2->address.ipv4.max &&

















291
                 p1->address.ipv6.max == p2->address.ipv6.max &&
                 p1->address.ipv6.max == p2->address.ipv6.max &&

















292
                 p1->address.group == p2->address.group &&
                 p1->address.group == p2->address.group &&















293


                 ccs_is_same_number_union(&p1->port, &p2->port);


                 ccs_same_number_union(&p1->port, &p2->port);















294
 }
 }

















295
 
 

















296
 static bool ccs_merge_ip_network_acl(struct ccs_acl_info *a,
 static bool ccs_merge_ip_network_acl(struct ccs_acl_info *a,











#

Line 310 
 static bool ccs_merge_ip_network_acl(str


Line 310 
 static bool ccs_merge_ip_network_acl(str












310
 }
 }

















311
 
 

















312
 /**
 /**















313


  * ccs_write_network_policy - Write "struct ccs_ip_network_acl" list.


  * ccs_write_network - Write "struct ccs_ip_network_acl" list.















314
  *
  *

















315
  * @data:      String to parse.
  * @data:      String to parse.

















316
  * @domain:    Pointer to "struct ccs_domain_info".
  * @domain:    Pointer to "struct ccs_domain_info".











#

Line 319 
 static bool ccs_merge_ip_network_acl(str


Line 319 
 static bool ccs_merge_ip_network_acl(str












319
  *
  *

















320
  * Returns 0 on success, negative value otherwise.
  * Returns 0 on success, negative value otherwise.

















321
  */
  */















322


 int ccs_write_network_policy(char *data, struct ccs_domain_info *domain,


 int ccs_write_network(char *data, struct ccs_domain_info *domain,













323


                              struct ccs_condition *condition,


                       struct ccs_condition *condition, const bool is_delete)
















                              const bool is_delete)


 















324
 {
 {

















325
         struct ccs_ip_network_acl e = {
         struct ccs_ip_network_acl e = {

















326
                 .head.type = CCS_TYPE_IP_NETWORK_ACL,
                 .head.type = CCS_TYPE_IP_NETWORK_ACL,











#

Line 399 
 int ccs_write_network_policy(char *data,


Line 398 
 int ccs_write_network_policy(char *data,












398
         }
         }

















399
         if (!ccs_parse_number_union(w[3], &e.port))
         if (!ccs_parse_number_union(w[3], &e.port))

















400
                 goto out;
                 goto out;















401


         error = ccs_update_domain_policy(&e.head, sizeof(e), is_delete, domain,


         error = ccs_update_domain(&e.head, sizeof(e), is_delete, domain,













402


                                          ccs_is_same_ip_network_acl,


                                   ccs_same_ip_network_acl,













403


                                          ccs_merge_ip_network_acl);


                                   ccs_merge_ip_network_acl);















404
  out:
  out:

















405
         if (w[2][0] == '@')
         if (w[2][0] == '@')

















406
                 ccs_put_group(e.address.group);
                 ccs_put_group(e.address.group);





























Legend:



Removed from v.3691
 


changed lines


 
Added in v.3693













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[tomoyo]/trunk/1.8.x/ccs-patch/security/ccsecurity/network.c
-revision 3691 by kumaneko,
Sun May 23 03:22:24 2010 UTC
+revision 3693 by kumaneko,
Sun May 23 08:05:44 2010 UTC
 Line 276 
 static int ccs_network_entry(const bool
          return error;
  }
- static bool ccs_is_same_ip_network_acl(const struct ccs_acl_info *a,
+ static bool ccs_same_ip_network_acl(const struct ccs_acl_info *a,
                                         const struct ccs_acl_info *b)
  {
          const struct ccs_ip_network_acl *p1 = container_of(a, typeof(*p1),
                                                             head);
          const struct ccs_ip_network_acl *p2 = container_of(b, typeof(*p2),
                                                             head);
-         return ccs_is_same_acl_head(&p1->head, &p2->head)
+         return ccs_same_acl_head(&p1->head, &p2->head)
                  && p1->address_type == p2->address_type &&
                  p1->address.ipv4.min == p2->address.ipv4.min &&
                  p1->address.ipv6.min == p2->address.ipv6.min &&
                  p1->address.ipv4.max == p2->address.ipv4.max &&
                  p1->address.ipv6.max == p2->address.ipv6.max &&
                  p1->address.group == p2->address.group &&
-                 ccs_is_same_number_union(&p1->port, &p2->port);
+                 ccs_same_number_union(&p1->port, &p2->port);
  }
  static bool ccs_merge_ip_network_acl(struct ccs_acl_info *a,
 Line 310 
 static bool ccs_merge_ip_network_acl(str
  }
  /**
-  * ccs_write_network_policy - Write "struct ccs_ip_network_acl" list.
+  * ccs_write_network - Write "struct ccs_ip_network_acl" list.
   *
   * @data:      String to parse.
   * @domain:    Pointer to "struct ccs_domain_info".
 Line 319 
 static bool ccs_merge_ip_network_acl(str
   *
   * Returns 0 on success, negative value otherwise.
   */
- int ccs_write_network_policy(char *data, struct ccs_domain_info *domain,
+ int ccs_write_network(char *data, struct ccs_domain_info *domain,
-                              struct ccs_condition *condition,
+                       struct ccs_condition *condition, const bool is_delete)
-                              const bool is_delete)
  {
          struct ccs_ip_network_acl e = {
                  .head.type = CCS_TYPE_IP_NETWORK_ACL,
-Line 399 
 int ccs_write_network_policy(char *data,
+Line 398 
 int ccs_write_network_policy(char *data,
          }
          if (!ccs_parse_number_union(w[3], &e.port))
                  goto out;
-         error = ccs_update_domain_policy(&e.head, sizeof(e), is_delete, domain,
+         error = ccs_update_domain(&e.head, sizeof(e), is_delete, domain,
-                                          ccs_is_same_ip_network_acl,
+                                   ccs_same_ip_network_acl,
-                                          ccs_merge_ip_network_acl);
+                                   ccs_merge_ip_network_acl);
   out:
          if (w[2][0] == '@')
                  ccs_put_group(e.address.group);
 Legend:



Removed from v.3691
 


changed lines


 
Added in v.3693
 Legend:



Removed from v.3691
 


changed lines


 
Added in v.3693
-Removed from v.3691
+Added in v.3693
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

オープンソース・ソフトウェアの開発とダウンロード

TOMOYO

Subversion リポジトリの参照